drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,215 Commits 1 Branch 0 Tags
Commit Graph

150215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
de9818a839 am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '3dadb79a7fe90a727568aa76744f0d0c5ea44782':
  Remove "forgot pattern" in pattern view
 2014-09-05 16:20:01 +00:00
Jorim Jaggi
1210912600 Merge "Remove "forgot pattern" in pattern view" into lmp-dev 2014-09-05 16:12:04 +00:00
Christoph Studer
ffaca61360 am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit 'd6036d35627f0ac3e03343b1e31108616b687eea':
  SysUI: Sort status bar notification icons
 2014-09-05 16:04:30 +00:00
Jim Miller
653bd3331f am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit '8007e4a65c2839de43b48199df9f8f3004e82c7f':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 16:04:27 +00:00
Dharmesh Mokani
2b6bd1df2d am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit 'efd4ea013b00a1b645afde65bae56dc0a8370276':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 16:04:23 +00:00
Christoph Studer
8e2128ba4f Merge "SysUI: Sort status bar notification icons" into lmp-dev 2014-09-05 15:59:41 +00:00
Jim Miller
a8ecf45398 Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 2014-09-05 15:57:16 +00:00
Dharmesh Mokani
19b210c98c Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 2014-09-05 15:56:17 +00:00
Evan Charlton
ac58af0806 am 55533d6a: Merge "Add a way to fetch the current connection manager" into lmp-dev 
* commit '55533d6ae24c9c270cd8b8d0277e28bb856aa096':
  Add a way to fetch the current connection manager
 2014-09-05 15:48:37 +00:00
Evan Charlton
235c159633 Merge "Add a way to fetch the current connection manager" into lmp-dev 2014-09-05 15:41:24 +00:00
Alexandra Gherghina
de74c2c1d2 am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit 'e27eb3ec797a5a9621fc4eece3579bb4fcbf0363':
  Rename intent extra following API review
 2014-09-05 15:31:07 +00:00
Marcin Kosiba
e288c4f43d am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit '210d7b224da0425b3c65888ac49abd1c6ef9f846':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 15:31:03 +00:00
Chris Wren
d717a4bbe2 am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'b59b5205ff9c784085bf6b85bceb496e608fc042':
  Keep contact affinities separate across users.
 2014-09-05 15:30:59 +00:00
Shishir Agrawal
d1d5b97bc0 am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 
* commit 'e90b1315a83fd75906fa1bc876fb2973cf6f8676':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.
 2014-09-05 15:30:56 +00:00
Esteban Talavera
385c145e2b am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '2c6aa357bddb428193c0c006d9535f208b9d8903':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 15:30:52 +00:00
Anwar Ghuloum
d8541e438b am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev 
* commit 'f8545bc6f498e0b93f7ee42e51ea0ff05e695731':
  Timing Hacks DO NOT MERGE
 2014-09-05 15:30:49 +00:00
George Mount
d85dd0fd1f am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b555f0cf77c66c9d8204146c3f16e27cf83c4ed8':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:30:45 +00:00
George Mount
2654657fca am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit 'da6df616bc21eabf56ff9de8f8606898fc388e60':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:30:41 +00:00
Christoph Studer
cca269f2fd am fa169184: Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev 
* commit 'fa1691841ea52fd34b1f6c80918763e5816c25b9':
  NoMan: Fix speedbump for PRIORITY_MIN intrusives
 2014-09-05 15:30:37 +00:00
Jorim Jaggi
5709ae20f0 am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev 
* commit '6f52cfa8f52559fcc3c5c17348da18d18eed5655':
  Remove the scrimming of notifications
 2014-09-05 15:30:34 +00:00
Adrian Roos
14f779c42f am 8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev 
* commit '8ab5922758bf29d1b7de82214e9b7e6c3eb7c0ee':
  Reorder brightness slider mirror in front of album art
 2014-09-05 15:30:31 +00:00
George Mount
371d00e4b0 am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit '472294569a26cb60d75202d5bc13e44fb040dbce':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:30:27 +00:00
Jorim Jaggi
70d56cf4dc am 4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev 
* commit '4ec48cb7b428eef28e95ec4c6bf484d32196fa1a':
  Hide notifications when occluded and disabled on keyguard
 2014-09-05 15:30:23 +00:00
Selim Cinek
efc953276d am 1f49d9b3: Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev 
* commit '1f49d9b36609f9260bdf85ff3f5dc85f8af7229b':
  Fixed a bug where the notifications could overlap when reset
 2014-09-05 15:30:20 +00:00
Martin Kosiba
3046b13006 am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev 
* commit 'c3ec88fd433540729a4a818d4d01b21cf2106835':
  Change WebView.zoomBy return type to void.
 2014-09-05 15:30:16 +00:00
Winson Chung
aeab63fb1d am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '927df1c290c65ae877b67e2383517494ee7afb68':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:30:12 +00:00
Jason Monk
1c682c9024 am 78337827: Merge "Allow downtime to exit from no interruptions" into lmp-dev 
* commit '783378274989c6d5fe032993f595e85cc58c362e':
  Allow downtime to exit from no interruptions
 2014-09-05 15:30:00 +00:00
Adrian Roos
620f0374c5 am c5126d91: Merge changes Ibb63814e,I0322b1e6 into lmp-dev 
* commit 'c5126d91e9d772f3f1ed64404746f8fe7af580a7':
  Prevent full shade guesture from doing the wrong thing
  Add current user announce to MultiUserSwitch
 2014-09-05 15:29:57 +00:00
Jorim Jaggi
48fad4996e am 162a1b42: Merge "Use material screen off animation for all devices" into lmp-dev 
* commit '162a1b4273ec8461c58925b5450392ad4920c548':
  Use material screen off animation for all devices
 2014-09-05 15:29:53 +00:00
Kenny Guy
c57a8701b6 am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit '42484d4365201d4250ebedb2f4cd6348c626b158':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:29:50 +00:00
Christoph Studer
1452ced2cd am 8dd353c8: Merge "SysUI: Upsort PRIORITY_MAX system notifications" into lmp-dev 
* commit '8dd353c86c38f181032b5e0135bb91707ced9832':
  SysUI: Upsort PRIORITY_MAX system notifications
 2014-09-05 15:29:46 +00:00
Winson Chung
5b55ae993c am 893fd9fc: Merge "Ensure that there is enough space for the tablet search widget. (Bug 17190069)" into lmp-dev 
* commit '893fd9fc8320806a5bf14284775e2600c85f78d2':
  Ensure that there is enough space for the tablet search widget. (Bug 17190069)
 2014-09-05 15:29:42 +00:00
Brian Carlstrom
cc9af8c62c am 8a5a6aec: Merge "Fix backwards arguments to performDexOpt" into lmp-dev 
* commit '8a5a6aec125a398d7c14874a3780b27d642ee892':
  Fix backwards arguments to performDexOpt
 2014-09-05 15:29:39 +00:00
Jungshik Jang
3c50927bb4 am 796603a5: Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev 
* commit '796603a56b6dac4eb7c7111fec38f8b564fdb45d':
  Prevent sending <Feature Abort> for some messages.
 2014-09-05 15:29:35 +00:00
Alexandra Gherghina
f363bda252 Merge "Rename intent extra following API review" into lmp-dev 2014-09-05 15:16:02 +00:00
Marcin Kosiba
8d4e83aca0 Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 2014-09-05 15:13:40 +00:00
Chris Wren
c237555c6c Merge "Keep contact affinities separate across users." into lmp-dev 2014-09-05 14:58:40 +00:00
Shishir Agrawal
949bb79f70 Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 2014-09-05 14:48:20 +00:00
Alexandra Gherghina
3315f6b5a3 Rename intent extra following API review 
Bug: 17389968
Change-Id: Id2bd8d12019ad7a4c5a3ac8a7f76f55d06fc4dff
 2014-09-05 15:48:07 +01:00
Esteban Talavera
ac15b85229 Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 2014-09-05 14:46:10 +00:00
Chris Wren
da4bd209cf Keep contact affinities separate across users. 
Also ignore people extras on USER_ALL notifications.

Bug: 16213960
Change-Id: Ic0341c88d42d4a4f12cac35c0f41c2746aec02ac
 2014-09-05 10:36:32 -04:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Marcin Kosiba
100c20c900 Rename WebResourceRequest.hasUserGestureInsecure to hasGesture. 
This is in response to API council feedback.

BUG: 17253647
Change-Id: I6da2aa2510a73276fcdbad9219adfeaaed41d3ba
 2014-09-05 14:22:32 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE 
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
 2014-09-05 07:17:39 -07:00
George Mount
ffd09aed4e Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282 Merge "Fix NPE when Window disappears during a transition." into lmp-dev 2014-09-05 14:14:40 +00:00
Christoph Studer
7f579fda4b Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev 2014-09-05 14:11:52 +00:00
Christoph Studer
327bf78a7d NoMan: Fix speedbump for PRIORITY_MIN intrusives 
Bug: 16782616
Change-Id: I35fb875bed8cbd90ecd37edc8973c1771be3584d
 2014-09-05 14:11:37 +00:00
Christoph Studer
668c8970ff SysUI: Sort status bar notification icons 
Bug: 15761406
Change-Id: I64884319014d6fa3008c0db4060db7b9b066b6d7
 2014-09-05 16:00:09 +02:00
Jorim Jaggi
f2f0a071c2 Merge "Remove the scrimming of notifications" into lmp-dev 2014-09-05 13:58:33 +00:00