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

155992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Charlton
dfa1ee5242 am c50011c0: am a42cdf2a: am 2b70dbb4: Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 
* commit 'c50011c0903c79a32d375a533c590b8616e57fa5':
  Add a constant for CHANGE_PHONE_ACCOUNTS action
 2014-09-05 17:19:11 +00:00
Jorim Jaggi
e86a623eac am bba27b85: am eb775042: am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit 'bba27b85d81ad59f959490a5328b11a0bc918c18':
  Don't update notification layer when collapsing the panel
 2014-09-05 17:19:00 +00:00
Robert Greenwalt
683aba53f8 am 9d869562: am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit '9d869562cbcb9cabcba58320fdc3f6f5632809a9':
  Fix networking API per scripting checks.
 2014-09-05 17:18:46 +00:00
Jorim Jaggi
2c65879866 am 731ede8e: am fea3c808: am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit '731ede8e634d179dd9d3b00404881166a05f9efb':
  Remove "forgot pattern" in pattern view
 2014-09-05 17:18:42 +00:00
Christoph Studer
7a17bf899f am a9bbd845: am 14161fff: am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit 'a9bbd8457c56e2760b48047bdc4209b9c168abd7':
  SysUI: Sort status bar notification icons
 2014-09-05 17:18:37 +00:00
Jim Miller
4c6d777384 am 29d2611e: am c5adf557: am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit '29d2611eea8051c49b953b4dd3767737c50d4eaa':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 17:18:31 +00:00
Dharmesh Mokani
140616a89c am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit '6feba6b61ecddcb93a2b33a2ea52daad6cf70bd5':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 17:18:26 +00:00
Evan Charlton
6de978d017 am 0142b522: am 3b1f8394: am 55533d6a: Merge "Add a way to fetch the current connection manager" into lmp-dev 
* commit '0142b5226f593aa8869d83e63683b45bb7ff14c4':
  Add a way to fetch the current connection manager
 2014-09-05 17:18:21 +00:00
Alexandra Gherghina
f32a644580 am 1d42993c: am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit '1d42993c437ff287f0507128ed07b2c6ff9f545e':
  Rename intent extra following API review
 2014-09-05 17:18:16 +00:00
Marcin Kosiba
7dcb4e6c3e am 9257e8e4: am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit '9257e8e46234095a09c8678dc5cb4eefc09afedf':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 17:18:11 +00:00
Chris Wren
e341247c58 am a849cbc0: am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'a849cbc0f870791acfd3dd3698cc81256ac1db6e':
  Keep contact affinities separate across users.
 2014-09-05 17:18:05 +00:00
Shishir Agrawal
6ac9a8d601 am bd026736: am f6b053a5: am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 
* commit 'bd026736b81ec9236d421f8d7702e84d2df4dc74':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.
 2014-09-05 17:17:58 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:17:53 +00:00
Anwar Ghuloum
e5a4d19e7b am 4a4a4a38: (-s ours) am 0b404514: (-s ours) am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev 
* commit '4a4a4a38f3172a02f4d1ad534afdccacb99a2cfe':
  Timing Hacks DO NOT MERGE
 2014-09-05 17:17:48 +00:00
Evan Charlton
9e139bb9a4 am a42cdf2a: am 2b70dbb4: Merge "Add a constant for CHANGE_PHONE_ACCOUNTS action" into lmp-dev 
* commit 'a42cdf2aae4196f98b8067e1f304c1a77cfad0a6':
  Add a constant for CHANGE_PHONE_ACCOUNTS action
 2014-09-05 17:09:18 +00:00
Jorim Jaggi
c784d209a0 am eb775042: am 0e2b27df: Merge "Don\'t update notification layer when collapsing the panel" into lmp-dev 
* commit 'eb775042aeea79eb8a8b2521675097bfcf465c93':
  Don't update notification layer when collapsing the panel
 2014-09-05 17:09:12 +00:00
Robert Greenwalt
c049708d52 am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit 'b6b076866bad5b8a7550d469ce73128b963fc18f':
  Fix networking API per scripting checks.
 2014-09-05 17:09:06 +00:00
Jorim Jaggi
8a12c264ba am fea3c808: am 3dadb79a: Merge "Remove "forgot pattern" in pattern view" into lmp-dev 
* commit 'fea3c808c291b258ab340c8574c0023db6d1c01d':
  Remove "forgot pattern" in pattern view
 2014-09-05 17:08:59 +00:00
Christoph Studer
f1606d6f1a am 14161fff: am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit '14161fff8665abfc6cc572296b976808ec152f66':
  SysUI: Sort status bar notification icons
 2014-09-05 17:08:52 +00:00
Jim Miller
451b93cbb0 am c5adf557: am 8007e4a6: Merge "Send USER_PRESENT broadcast after keyguard animation finishes" into lmp-dev 
* commit 'c5adf5570377e83892bf6f3575b8fe0a49fa02da':
  Send USER_PRESENT broadcast after keyguard animation finishes
 2014-09-05 17:08:47 +00:00
Dharmesh Mokani
1ba5f6a2d1 am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit '0b230ea6eb3902e5ee308d7974c521715d1191fb':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 17:08:42 +00:00
Evan Charlton
18dbe61c05 am 3b1f8394: am 55533d6a: Merge "Add a way to fetch the current connection manager" into lmp-dev 
* commit '3b1f8394b8e7f4d68cf3bf88292fcec59328824d':
  Add a way to fetch the current connection manager
 2014-09-05 17:08:22 +00:00
Alexandra Gherghina
4a08f484cc am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit 'c0e7e74c9cb418f24d67c192543681d652c16cfc':
  Rename intent extra following API review
 2014-09-05 17:07:39 +00:00
Marcin Kosiba
1f5d122b2d am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit 'e9c1cb958a1b1caa0ab7a9b31fa4f10798f972da':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 17:07:35 +00:00
Chris Wren
b57da35784 am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit '7b45868e6083af082c232e32f48ebf24250f317d':
  Keep contact affinities separate across users.
 2014-09-05 17:07:30 +00:00
Shishir Agrawal
42ccab8c0c am f6b053a5: am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev 
* commit 'f6b053a51911ba51c84fb3e1dfeb8cb12be3bb3d':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.
 2014-09-05 17:07:25 +00:00
Esteban Talavera
c8cf27016d am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '4414705e57f8f090ccc99ca39613827d7f650612':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:07:19 +00:00
Anwar Ghuloum
f595864527 am 0b404514: (-s ours) am f8545bc6: Merge "Timing Hacks DO NOT MERGE" into lmp-dev 
* commit '0b404514d9a254c138a31d9e5bcb62dd4c760a79':
  Timing Hacks DO NOT MERGE
 2014-09-05 17:07:14 +00:00
Evan Charlton
c3d17cd738 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:23 +00:00
Jorim Jaggi
5f6a4726d1 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:19 +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
dca68f208a 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:55 +00:00
Jorim Jaggi
8fbe98981e 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:49 +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
Christoph Studer
61c4a11dc7 am d6036d35: Merge "SysUI: Sort status bar notification icons" into lmp-dev 
* commit 'd6036d35627f0ac3e03343b1e31108616b687eea':
  SysUI: Sort status bar notification icons
 2014-09-05 16:05:00 +00:00
Jim Miller
83aaad4c9b 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:56 +00:00
Dharmesh Mokani
9f655607eb am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit 'efd4ea013b00a1b645afde65bae56dc0a8370276':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 16:04:51 +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
George Mount
0a6f664ff2 am b7c6a799: am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b7c6a7990a59a70ab1876f7e6a1322a92fbcc4ed':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:55:47 +00:00
George Mount
e4bf22a740 am 6629a210: am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit '6629a21012a09b30ba50446aa9fdf901d803afd9':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:55:42 +00:00
Christoph Studer
dcc50a651d am 918544fc: am ad8f1ec9: am fa169184: Merge "NoMan: Fix speedbump for PRIORITY_MIN intrusives" into lmp-dev 
* commit '918544fcd6e529146f6f816963452bb55f8b92f0':
  NoMan: Fix speedbump for PRIORITY_MIN intrusives
 2014-09-05 15:55:36 +00:00
Jorim Jaggi
18f201a309 am 82c10ab2: am 75595be4: am 6f52cfa8: Merge "Remove the scrimming of notifications" into lmp-dev 
* commit '82c10ab262319585ff74760cf96f493ec02c7d2f':
  Remove the scrimming of notifications
 2014-09-05 15:55:31 +00:00
Adrian Roos
0738f9a7ef am b1edc469: am f8ac8572: am 8ab59227: Merge "Reorder brightness slider mirror in front of album art" into lmp-dev 
* commit 'b1edc469047d7b8e36aa2113459d3d0bd42c035f':
  Reorder brightness slider mirror in front of album art
 2014-09-05 15:55:26 +00:00
George Mount
729aa5b2b6 am a538aac4: am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit 'a538aac40e100719fbcfd24b87aab48e29ae31eb':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:55:20 +00:00
Jorim Jaggi
c755564890 am 3591761f: am 1c3f1783: am 4ec48cb7: Merge "Hide notifications when occluded and disabled on keyguard" into lmp-dev 
* commit '3591761f2a61a3546946287956e7eca9a38c5cb1':
  Hide notifications when occluded and disabled on keyguard
 2014-09-05 15:55:15 +00:00