Commit Graph

5310 Commits

Author SHA1 Message Date
Yasuhiro Matsuda
6d444185e5 resolved conflicts for merge of fcf9ab5a to master
Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
2015-09-03 00:12:30 +09:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Oren Blasberg
ddc453a342 Add a new submenu arrow for popup menu items.
This arrow is shown when the item corresponds to a submenu.

Bug: 20127825
Change-Id: Ida70d7707e00e1cda84ed6135333f09a511cd6c5
2015-09-01 16:38:06 -07:00
Oren Blasberg
6b49d30034 Merge "Pull out widget helpers into their own classes." 2015-09-01 21:11:04 +00:00
Adrian Roos
e6da9bb7c6 am e803c9ed: am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit 'e803c9ed7f1ae5f31f041e7c6ce14d91965b7ada':
  Disable fingerprint after force lock
2015-09-01 16:08:26 +00:00
Adam Lesinski
54c070ef14 am f7ce28fa: am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit 'f7ce28fad5d76267a9e69a05f6a2147c6baae827':
  BatteryStats: Start using cpu power from kernel
2015-09-01 16:07:56 +00:00
Oren Blasberg
f44d90b5c2 Pull out widget helpers into their own classes.
This is in service of desktop-style submenus. Follow up CLs will make
use of the newly independent classes. MOST of the changes in this CL
are simply moving code from one place to another. Below are
descriptions of the new files added:

DropDownListView:
Decouple this from ListPopupWindow, so other "menu popup"
implementations [forthcoming] may make use of it.
This class is UNCHANGED except for the addition of the
setListSelectionHidden method.

ForwardingListener:
Decouple this from ListPopupWindow, so that other clients of this
listener can expect a more general ShowableListMenu rather than a
concrete ListPopupWindow.  This will be useful later when we want to
use something other than ListPopupWindow to show a menu.
This class is UNCHANGED, except for (1) using the getListView() on
popup rather than accessing its mDropDownList member, and (2)
replacing ListPopupWindow return values with ShowableListMenu.

MenuAdapter:
Decouple from MenuPopupHelper so it may be used by forthcoming "menu
popup" implementations rather than just by MenuPopupHelper itself.
This class is UNCHANGED.

ShowableListMenu:
A new interface to encapsulate a menu that can be shown or hidden.
This will be implemented by both ListPopupWindow and a forthcoming
"menu popup" class.

Bug: 20127825
Change-Id: I565b444d25e966ff8b8c6ceac7be8de56a9116df
2015-08-31 14:29:34 -07:00
Adrian Roos
e803c9ed7f am 9cb060d0: am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '9cb060d0c314630f6af89677263233f3253ad847':
  Disable fingerprint after force lock
2015-08-31 20:40:54 +00:00
Adrian Roos
7e1775d246 am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev
* commit '781953123e5b0f0f85691eabc13b3430c3054a10':
  Disable fingerprint after force lock
2015-08-31 20:16:57 +00:00
Adrian Roos
781953123e Merge "Disable fingerprint after force lock" into mnc-dr-dev 2015-08-31 20:04:46 +00:00
Adam Lesinski
f7ce28fad5 am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
  BatteryStats: Start using cpu power from kernel
2015-08-31 19:33:24 +00:00
Adam Lesinski
69e17f59f8 am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev
* commit 'da43a3aacaba069e79f1dbfa491f6bc0b6f7fa95':
  BatteryStats: Start using cpu power from kernel
2015-08-31 19:13:39 +00:00
Alan Viverette
82d31d456e Make AbsActionBarView eat touch/hover events
This code is taken straight out of Toolbar.

Bug: 22709057
Change-Id: I54ef6af8436454718009186afed79f3a003ac271
2015-08-31 15:13:05 -04:00
Adam Lesinski
da43a3aaca Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev 2015-08-31 19:04:46 +00:00
Adrian Roos
0cb50efdc2 Disable fingerprint after force lock
Bug: 23275072
Change-Id: Icaeffaa1fa22a4a800ddf0f38105099557c74317
2015-08-28 23:54:43 +00:00
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
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server.
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09: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
Adam Lesinski
ab7672d45a BatteryStats: Start using cpu power from kernel
This allows us to stop using approximate methods of attributing
cpu frequency time across apps and to use a more precise kernel
method that is aware of the time spent by a process on a given core
at a given frequency.

Bug:22773176
Change-Id: I3c34365fa8c73204f178a5610423901b13453d06
2015-08-21 16:46:14 -07: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