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

150252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
ba2957829e am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
  Update FrameStats API per api-council request.
 2014-09-05 17:12:44 +00:00
Svetoslav
59c1be6684 am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.
 2014-09-05 17:12:40 +00:00
Wei Liu
5d43518e89 am ea237b13: am 0641ab3d: am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185 
* commit 'ea237b130ddc76269131a2cb7ef56940033fea7e':
  Add clear_top flag to settings action intent. Bug: 17200185
 2014-09-05 17:12:37 +00:00
Amith Yamasani
116b5865cf am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev 
* commit '3c0a511dee505d46ebab80a9b5a1579d39e597fd':
  Remove class that was moved to a different package.
 2014-09-05 17:12:31 +00:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Wei Liu
133f143069 am 0641ab3d: am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185 
* commit '0641ab3dd0282edc272f425a245ede63a78dd222':
  Add clear_top flag to settings action intent. Bug: 17200185
 2014-09-05 17:07:19 +00:00
Svetoslav
53dcd394aa Update FrameStats API per api-council request. 
bug:17390382

Change-Id: I50518834569f4d0ec394709294537256f03530e0
 2014-09-05 10:07:02 -07:00
Svetoslav
c7d62f02b8 Addressing API council comments for UserManager. 
bug:17390424

Change-Id: I498d2541289915cb7db16e5c3249ccc7a7dc5ee6
 2014-09-05 10:07:02 -07:00
Amith Yamasani
d50f8c46f6 Merge "Remove class that was moved to a different package." into lmp-dev 2014-09-05 17:03:31 +00:00
Wei Liu
0641ab3dd0 am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185 
* commit '636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df':
  Add clear_top flag to settings action intent. Bug: 17200185
 2014-09-05 16:52:20 +00:00
Jeff Sharkey
ec50db2b13 am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev 
* commit 'e7bea8e53ba42dc7a6de18dc19f7b1fcfa7bbdf7':
  Move Size parceling to Bundle.
 2014-09-05 16:51:18 +00:00
Jeff Sharkey
d3cc74cac2 Merge "Move Size parceling to Bundle." into lmp-dev 2014-09-05 16:46:00 +00:00
Amith Yamasani
36d8d25860 Remove class that was moved to a different package. 
Completes the API change.

Bug: 17006805
Change-Id: I5031e05df6b1a317a902482274eb056ecaf5dfbb
 2014-09-05 09:42:59 -07:00
Tom O'Neill
e5dbe7db79 am 971e730a: Merge "Suppress location tile in QS on lock screen" into lmp-dev 
* commit '971e730a5d646719688a70a59d8b7c987945d4ef':
  Suppress location tile in QS on lock screen
 2014-09-05 16:41:17 +00:00
Amith Yamasani
a56911838c am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev 
* commit '0c3b7b1567d591a5723456f9935dc00e4131daff':
  Don't allow guests to install from unknown sources
 2014-09-05 16:41:13 +00:00
Tom O'Neill
08e76661bc Merge "Suppress location tile in QS on lock screen" into lmp-dev 2014-09-05 16:37:44 +00:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Amith Yamasani
0e9f6aca28 am 5c605494: Merge "Fix current.txt (fixes build)" into lmp-dev 
* commit '5c6054945de9f51e34d94e4f6eb463d0da850746':
  Fix current.txt (fixes build)
 2014-09-05 16:31:37 +00:00
Akos Ludanyi
977fdf90f8 am 9f5e2229: Merge "Fix ProviderTestCase2 broken by ag/519661:" into lmp-dev 
* commit '9f5e22294e6493a1fbb511d1ba956ea8266ac2b3':
  Fix ProviderTestCase2 broken by ag/519661:
 2014-09-05 16:31:34 +00:00
Evan Charlton
a19d7e4a28 am 2b70dbb4: Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 
* commit '2b70dbb479db7ada3ecbda056501846624d9bbea':
  Add a constant for CHANGE_PHONE_ACCOUNTS action
 2014-09-05 16:31:30 +00:00
Jorim Jaggi
6ec5f17b64 am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit '0e2b27df7d672c0b765fd37b2a0d96ba6266a0d5':
  Don't update notification layer when collapsing the panel
 2014-09-05 16:31:27 +00:00
Amith Yamasani
450592d37c Merge "Fix current.txt (fixes build)" into lmp-dev 2014-09-05 16:28:19 +00:00
Akos Ludanyi
acd9ec0510 Merge "Fix ProviderTestCase2 broken by ag/519661:" into lmp-dev 2014-09-05 16:28:05 +00:00
Amith Yamasani
229a125fa2 Fix current.txt (fixes build) 
Change-Id: Iaa9272d6f32b1562c7d1fbd41e8031c0f9050953
 2014-09-05 16:28:03 +00:00
Evan Charlton
c69bfe24a8 Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 2014-09-05 16:27:59 +00:00
Jorim Jaggi
89b39b2b07 Merge "Don't update notification layer when collapsing the panel" into lmp-dev 2014-09-05 16:22:25 +00:00
Robert Greenwalt
e2565c0ecc am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit 'a155ef8135420584325cbe94967058b3f83e88b0':
  Fix networking API per scripting checks.
 2014-09-05 16:20:05 +00:00
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
Robert Greenwalt
a0843f4967 Merge "Fix networking API per scripting checks." into lmp-dev 2014-09-05 16:17:26 +00:00
Evan Charlton
6d8604ff22 Add a constant for CHANGE_PHONE_ACCOUNTS action 
To make life easier for developers, pull the CHANGE_PHONE_ACCOUNTS
intent action out to a constant.

Bug: 17383844
Change-Id: I6989324c8d01930cd2e2be5d7d0defea860fc718
 2014-09-05 16:12:20 +00:00
Jorim Jaggi
1210912600 Merge "Remove "forgot pattern" in pattern view" into lmp-dev 2014-09-05 16:12:04 +00:00
Jeff Sharkey
5ef33984d0 Move Size parceling to Bundle. 
Size itself shouldn't be Parcelable, since that would be a layering
violation.

Bug: 17390381
Change-Id: Ica62709bd889db51c916c550a0146714b002baa3
 2014-09-05 09:07:35 -07: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