Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,933 Commits 3 Branches 0 Tags
e2acc5e2839abe7dfc59bf6e2154cc88cd039436
Commit Graph

5079 Commits

Author SHA1 Message Date
Adrian Roos
7f5ef05b3f am 60aff469: am f90169d1: am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev 
* commit '60aff469b2abd8787ba4c3d326909128b57d06ea':
  Disable fingerprint after user lockout
 2015-08-26 01:12:03 +00:00
Adrian Roos
60aff469b2 am f90169d1: am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev 
* commit 'f90169d12b9654630740cd649b177c3bd6685190':
  Disable fingerprint after user lockout
 2015-08-26 01:04:42 +00:00
Adrian Roos
5bc2a2c0ce am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev 
* commit 'd56892da195b183bb5205a0c526bd730fb8a672f':
  Disable fingerprint after user lockout
 2015-08-26 00:51:02 +00:00
Adrian Roos
873010dfee Disable fingerprint after user lockout 
Bug: 22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
 2015-08-25 15:59:00 -07:00
Adrian Roos
e3b07451c3 resolved conflicts for merge of bcc26c02 to master 
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
 2015-08-21 18:08:58 -07:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
 2015-08-22 00:40:47 +00:00
Adrian Roos
a8bbebd426 am b5e47228: Add StrongAuthTracker 
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
  Add StrongAuthTracker
 2015-08-22 00:16:48 +00:00
Adrian Roos
b5e4722891 Add StrongAuthTracker 
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
 2015-08-21 13:28:00 -07:00
Rob Carr
4d832d7525 Merge "ActivityManagerService: Rather than throw an exception, return INVALID_STACK_ID from getWorkspaceId when there is no associated workspace. This leaves the caller free to default." 2015-08-21 16:21:51 +00:00
Robert Carr
49cbf6ba24 ActivityManagerService: Rather than throw an exception, return 
INVALID_STACK_ID from getWorkspaceId when there is no associated
workspace. This leaves the caller free to default.

PhoneWindow: Default to FULLSCREEN_WORKSPACE_STACK_ID in the case
of INVALID_STACK_ID returned from the ActivityManagerService.

Bug: #23171731

Change-Id: Id5132337459bd2ef81b2416434d7657b6f3d1855
 2015-08-21 16:21:09 +00:00
Clara Bayarri
3014e63f08 Merge "Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen" 2015-08-20 14:19:05 +00:00
Clara Bayarri
f2debb1f9a Hook up Ctrl + '/' to SysUI for a Keyboard Shortcuts screen 
This CL adds the necessary hooks between PhoneWindowManager
and SysUI to show a keyboard shortcuts screen given a specific
shortcut combination. SysUI for now just shows a Toast.

Change-Id: Icf43a81776b04a2e96a540f45b7cd3464342d679
 2015-08-20 15:11:10 +01:00
Nicolas Prevot
741abfc120 Fix cross-profile intent filters with system-user split. 
Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf
 2015-08-20 12:14:37 +00:00
Stefan Kuhne
952d3c1e1f Merge "Adding move window functionality for free form desktop" 2015-08-19 23:36:23 +00:00
Skuhne
81c524a664 Adding move window functionality for free form desktop 
This patch adds the capability to move / drag a floating window on
the desktop when it has a non client decor capition.

It also adds the framework necessary adjustments to keep the window
in a visible area without relayout'ing the window upon move.

Bug: 21738328
Bug: 23176762
Change-Id: I0927e98902d8172f58d21c19c249936a81181678
 2015-08-19 21:33:01 +00:00
Dianne Hackborn
e264f9a51e am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5a1234fabf73224d107ce0715682728b35357203':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 19:01:16 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:39:56 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Alan Viverette
6bc3cab958 Merge "Allow ExploreByTouchHelper client to populate node/event for host" 2015-08-19 17:39:18 +00:00
Alan Viverette
4cbd3ac740 Save and restore accessibility focus using decor view 
Also avoids potential NPE when decor view is null or has no view root.

Bug: 23316836
Change-Id: Iccf75ddc0e4c769a234f5b80bc0707631c2719a2
 2015-08-19 10:07:29 -04:00
Dianne Hackborn
865b79b43b Fix issue #23326715: Clarify --checkin/-c options in batterystats 
Change-Id: I3f026447ba7c6d2c3f9ef065269c31a78cf73512
 2015-08-18 17:33:00 -07:00
Seigo Nonaka
c8e6c7996f Merge "Remove duplicate separator definition." 2015-08-17 21:33:30 +00:00
Alan Viverette
740b9397fb Allow ExploreByTouchHelper client to populate node/event for host 
Also introduces RuntimeException if client attempts to mix real and
virtual views.

Bug: 13343730
Change-Id: Iadb136fd289e6d3a60845ccca9923f94db83a9c0
 2015-08-17 15:44:21 -04:00
Chris Wren
b247ba1ff5 am c1acc1df: am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit 'c1acc1dfcea07cd9d78090c2aa90e93f91104729':
  instrument fingerprint service
 2015-08-17 17:16:15 +00:00
Chris Wren
c1acc1dfce am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
  instrument fingerprint service
 2015-08-17 17:09:52 +00:00
Chris Wren
2299478362 am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '877c22579e18736ee77d106ee2419ae99203bc9b':
  instrument fingerprint service
 2015-08-17 16:52:29 +00:00
Alan Viverette
abd89024ac Merge "Manage accessibility focus during PhoneWindow save and restore" 2015-08-17 16:51:44 +00:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Seigo Nonaka
ce2c7849a0 Remove duplicate separator definition. 
INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR are defined in
both InputMethodUtils and InputMethodSettings with same value.
This CL removes definitions in InputMethodSettings and use SEPARATOR
instead of SEPARATER.

INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR in
InputMethodUtils are originally introduced to IMMS by
If0104151b3526da6ecc669adde3119a239ecafeb and they are moved to
InputMethodUtils by I01f5fafbbcfe3e3f5313829162ec011eaf2ad991.

INPUT_METHOD_SEPARATER and INPUT_METHOD_SUBTYPE_SEPARATER in
InputMethodSettings are originally introducced to IMMS as a part of
IMMS.InputMethodSettings by Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
and InputMethodSettings is moved to InputMethodSettings by
I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6

Bug: 22285167
Change-Id: I3601c10902b44bb639581e3b816a3fc0a4851957
 2015-08-17 16:47:21 +00:00
Dan Sandler
f120f52337 Replace missing Color API. 
Removed in change Ic4cb43e7. I could switch back to the HSV
methods or just do the lazy thing and copy the code in like
in change Iae3d85c0. (Obviously I chose the latter.)

Change-Id: I154626c326ee0bbf389df75f4a8050136b56c2d5
 2015-08-16 05:45:32 +00:00
Seigo Nonaka
127c297b40 Merge "Use android.os.Debug.getCallers instead of self implementation." 2015-08-16 03:24:02 +00:00
Dan Sandler
8d365fe440 am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit 'd1b160f362e4d2bd961d8091b438f8eeb7d61a2f':
  "I tried to think of the most harmless thing."
 2015-08-16 03:02:19 +00:00
Dan Sandler
d1b160f362 am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."
 2015-08-16 02:54:36 +00:00
Dan Sandler
415c6cb235 am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."
 2015-08-16 02:36:17 +00:00
Seigo Nonaka
e27dc2b09d Use android.os.Debug.getCallers instead of self implementation. 
This changes debug message format but does not change any other behavior.

Maintaining InputMethodUtils.getStackTrace() doesn't make much sense
because we already have a similar method in android.os.Debug.

since there is already utility function in Android. The length 10 is
sufficient for identifying caller modules.

getStackTrace() is introduced by
Ib23849d352db33f0747aa9d5a178f00ac726c13b just for debugging purpose as a
part of Bug 6931482.

Bug: 22285167
Change-Id: If3a6c0d2f51dc3774eef14b4f496b5b59ddcf5a6
 2015-08-14 22:51:22 -07:00
Seigo Nonaka
dda53bf065 Merge "Move parseInputMethodsAndSubtypesString to InputMethodUtils." 2015-08-15 00:38:27 +00:00
Seigo Nonaka
2028ddaa50 Move parseInputMethodsAndSubtypesString to InputMethodUtils. 
This CL is mechanical code moving and does not change any existing
semantics.

parseInputMethodsAndSubtypesString is introduced by
If0104151b3526da6ecc669adde3119a239ecafeb for addressing Bug 19822542.
This code moving is one of the TODOs in above change.

Bug: 22285167
Change-Id: I01f5fafbbcfe3e3f5313829162ec011eaf2ad991
 2015-08-14 21:03:15 +00:00
Alan Viverette
dc12e1531f Merge "Remove framework-private HSV APIs, replace with luminance" 2015-08-14 20:21:50 +00:00
Daniel Sandler
8ad3e81701 Merge ""I tried to think of the most harmless thing."" into mnc-dev 2015-08-14 19:59:35 +00:00
Chris Wren
c510ad56a8 instrument fingerprint service 
auth and enroll actions
  dumpsys for enrollment statistics

Bug: 22951001
Change-Id: Id472789756df110fb8b02f542440c8112e0d2a44
 2015-08-14 15:43:15 -04:00
Dan Sandler
deafeedc81 "I tried to think of the most harmless thing." 
Bug: 21984798
Change-Id: I33ffabb72c831ff814363601a82ac9a388cb1e99
 2015-08-14 15:25:55 -04:00
Svetoslav Ganov
99ba7ad73c am f6401419: am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'f64014195b6d7bdc2f4d79f3c4c71de16d2fe338':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:44:14 +00:00
Svetoslav Ganov
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +00:00
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Alan Viverette
ec6cf1846a Manage accessibility focus during PhoneWindow save and restore 
Bug: 21403390
Change-Id: Ia474a54b55ba6e0309dda58939daa47b93a7dccb
 2015-08-14 10:31:00 -04:00
Maurice Lam
bead6bcc61 Merge "[ExploreByTouchHelper] Make a11y calls on views" 2015-08-13 21:46:54 +00:00
Stefan Kuhne
e3928ca01d Merge "Fixing layouting issues with NonClientDecorView" 2015-08-13 20:30:18 +00:00
Skuhne
f7b882c9c6 Fixing layouting issues with NonClientDecorView 
Also fixing focus issue where the non client decor view
focus bar could aquire the focus.

Bug: 22984173
Bug: 23115816
Change-Id: Id0e6645004404018ea29dd035ea8a15275e12da9
 2015-08-13 13:25:53 -07:00
Alan Viverette
c87ad53299 Merge "Temporary revert "Clean up phone window save/restore"" 2015-08-13 20:05:53 +00:00