Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
216,635 Commits 3 Branches 0 Tags
346296bd7d28fa79509605f30a222eb85d6bbb5d
Commit Graph

5235 Commits

Author SHA1 Message Date
Xiaohui Chen
86c69ddefd Cleanup USER_OWNER for cryptkeeper 
Bug: 19913735
Change-Id: I1105081aa2cb97d20afbd1e38d65c18c94e37a40
 2015-08-28 20:35:12 +00:00
Stefan Kuhne
400f29c37f Merge "Bring an activity to the front upon click & drag" 2015-08-28 15:28:37 +00:00
Skuhne
f36bb0ca99 Bring an activity to the front upon click & drag 
Clicking on the control area of a window should bring it to
the top and set the focus since it might be used as a drag
operation which would move / resize it.

Bug: 23179116
Change-Id: I672bfefa42dd85e962fe343aeb89167ce125f168
 2015-08-28 08:26:15 -07:00
Ajay Panicker
22190c0615 am 53b1884a: am 30aa53c7: am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev 
* commit '53b1884ac66f33614393013ffa1bfd89564d178b':
  Add StateMachine.removeDeferredMessages()
 2015-08-27 22:07:19 +00:00
Ajay Panicker
53b1884ac6 am 30aa53c7: am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev 
* commit '30aa53c7af22f98233a9c3acbe0efe20a569c8f1':
  Add StateMachine.removeDeferredMessages()
 2015-08-27 19:56:20 +00:00
Ajay Panicker
92fb534298 am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev 
* commit 'c07701f2764a1c09dc3e8af4321ff0ef66056fee':
  Add StateMachine.removeDeferredMessages()
 2015-08-27 19:40:05 +00:00
Ajay Panicker
c07701f276 am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev 
* commit '3e5b01185c08c46b80c395ca1f9c93e45cd98ba5':
  Add StateMachine.removeDeferredMessages()
 2015-08-27 19:33:31 +00:00
Ajay Panicker
c211978650 Add StateMachine.removeDeferredMessages() 
Bug: 23111466
Change-Id: Ifbb67d4eb080313af0968d5cb6b9508837e3458e
 2015-08-26 19:34:52 -07:00
Stefan Kuhne
0a16253b63 Merge "Fixing crash in some full screen cases" 2015-08-26 22:50:55 +00:00
Skuhne
a635a26716 Fixing crash in some full screen cases 
If an event makes it into the NonClientDecor and the
application is maximized, it should not process it.

Bug: 23489031
Change-Id: I661ea207522bbea64f297cd63cc2b5da192d47ae
 2015-08-26 15:45:58 -07:00
Selim Cinek
143c93d49f resolved conflicts for merge of f1935575 to master 
Change-Id: Ic18619bd5a81ae5172eef41bda0f8e473b6bda3f
 2015-08-26 11:51:36 -07:00
Selim Cinek
f193557530 am 42af140f: am 8f7a7e01: am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev 
* commit '42af140f4cee8b05c72fb43e7760ce8ebb8bcaf7':
  Launching the camera now from systemUI including animations
 2015-08-26 17:46:43 +00:00
Selim Cinek
8f7a7e0193 am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev 
* commit 'a07177f0ad362ab3e03029cf774e55579ea025cf':
  Launching the camera now from systemUI including animations
 2015-08-26 17:27:17 +00:00
Selim Cinek
a07177f0ad Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev 2015-08-26 17:20:50 +00:00
Selim Cinek
372d1bdd54 Launching the camera now from systemUI including animations 
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.

Bug: 22957192
Bug: 22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
 2015-08-26 10:12:06 -07:00
Alan Viverette
36a5c8d0df Fix alpha keyboard shortcuts with ToolbarActionBar 
Bug: 22651750
Change-Id: I10984cfaa50b8ae283f40a24f612882db613c1a0
 2015-08-26 12:48:17 -04:00
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