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

170141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
d0dca6f322 am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'f560f334b0784ebeea86997d391e1245590d131d':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 20:42:58 +00:00
Trevor Johns
8db20dc19d am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '2047e6a0d1f40e2187f1d7b9f8c7d2d5e97ec8cf':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 20:42:51 +00:00
Winson Chung
fee5e3d32a am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 20:42:45 +00:00
Evan Charlton
c0362c5da3 am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '10dff0a710b46cc1ddf554e6c83941a201aa6150':
  Re-add Connection.getCallCapabilities
 2014-12-03 20:42:39 +00:00
Nancy Chen
5125dc1cbc am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit 'a1163d575b41580352e39dde455ef2f1f7fbcbf4':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 20:42:34 +00:00
Paul Jensen
3249d63704 am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit '3107a9ad244004938ff7d5d731b3973113344da4':
  Retry failed network validation every 10 minutes.
 2014-12-03 20:42:28 +00:00
Adam Lesinski
455550d586 am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 20:42:22 +00:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 20:42:17 +00:00
Adrian Roos
bf6f7960f4 am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'b67d8ef66540bfb72db44721f353c661d1f88144':
  Refresh user list a little more eagerly
 2014-12-03 20:41:45 +00:00
Svetoslav
dc026bafa9 am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit '5303451efc8553f83d921185c6aac30a178d632f':
  Inconsistent media sizes for es-US locale.
 2014-12-03 20:41:39 +00:00
Jason Monk
5a938481f3 am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev 
* commit 'd6b001f154d7c1038edba4e7729b2aeb0124d359':
  Don't show no sim icon on wifi devices
 2014-12-03 20:41:33 +00:00
Daniel Sandler
23d7930cfd am b0607472: am 195c4388: Fixing bugs in the LLand. 
* commit 'b06074723fbed960749bab2b6e6b7e013f012e6a':
  Fixing bugs in the LLand.
 2014-12-03 20:41:27 +00:00
Jinsuk Kim
dfa931b400 am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action 
* commit '5f23693b5cad0647a6bd95ba50dc87bb9023e864':
  CEC: Check command type for power status monitor action
 2014-12-03 20:41:21 +00:00
Craig Mautner
a34a7d21a9 am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev 
* commit '418eecb6f870e4fc4dbb5715f61afd51827fe8a5':
  Don't process windows belonging to unshown users
 2014-12-03 20:41:15 +00:00
Lorenzo Colitti
45cd4df6a0 am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
  Make StatusBar display all default networks.
 2014-12-03 20:41:10 +00:00
Filip Gruszczynski
35a2d36085 am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 20:40:56 +00:00
Dongwon Kang
c0ab1086f0 am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit '25a051880666022163b9a641737f26adc31e5477':
  TIF: call tune() in HardwareSession
 2014-12-03 20:40:45 +00:00
Sanket Padawe
3a64032fe6 am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 20:25:24 +00:00
Jason Sams
5f9e59b229 am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev 
* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
  Fix bug in passing of context flags and version.
 2014-12-03 20:25:19 +00:00
Trevor Johns
f560f334b0 am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 18:36:25 +00:00
Trevor Johns
2047e6a0d1 am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 18:36:20 +00:00
Winson Chung
5051109699 am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 18:36:15 +00:00
Evan Charlton
10dff0a710 am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
  Re-add Connection.getCallCapabilities
 2014-12-03 18:36:10 +00:00
Nancy Chen
a1163d575b am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit '6963ff0e059977c901f4a961a24e7ffd3536af23':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 18:36:02 +00:00
Paul Jensen
3107a9ad24 am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit 'f805ba7dcc0e3cde052e2d5a84dedd478f206806':
  Retry failed network validation every 10 minutes.
 2014-12-03 18:35:57 +00:00
Adam Lesinski
72a6aeaca0 am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '91ca64ea291fceb43514b459ba76d13abc80f506':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 18:35:52 +00:00
Dianne Hackborn
bedd1744b2 am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 18:35:46 +00:00
Trevor Johns
e218d0d3b5 am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit '25bc6be2843fcff1be9c074f1e92dac1ce76d809':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 18:12:37 +00:00
Trevor Johns
4360c12bcb am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '740b22a522a224f88196ba33e06178e6a576f411':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 18:12:31 +00:00
Winson Chung
de9848c641 Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-12-03 18:10:38 +00:00
Evan Charlton
5ce118d1f4 Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 2014-12-03 18:09:31 +00:00
Nancy Chen
6963ff0e05 Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 2014-12-03 18:05:58 +00:00
Sailesh Nepal
ef77f0ed78 Re-add Connection.getCallCapabilities 
This method wasn't supposed to be removed.

Bug: 18594044
Bug: 18292176
Change-Id: Iac4cc0972643a8271957e480d3f48d50243af271
 2014-12-03 18:05:48 +00:00
Paul Jensen
f805ba7dcc Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 2014-12-03 18:04:30 +00:00
Adam Lesinski
91ca64ea29 Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 2014-12-03 18:04:24 +00:00
Dianne Hackborn
ef44c0514d Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after... 
...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
 2014-12-03 10:01:14 -08:00
Adrian Roos
b67d8ef665 am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'f235edf21532c63f149ad8653a76558fba087f3e':
  Refresh user list a little more eagerly
 2014-12-03 17:19:35 +00:00
Svetoslav
5303451efc am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit '4667d247bbff30d7fe47a4022b91eb03da17be4d':
  Inconsistent media sizes for es-US locale.
 2014-12-03 17:19:29 +00:00
Jason Monk
d6b001f154 am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev 
* commit '8d72046b9ba06feadbcf71815a1c6e1017c8da37':
  Don't show no sim icon on wifi devices
 2014-12-03 17:19:24 +00:00
Daniel Sandler
b06074723f am 195c4388: Fixing bugs in the LLand. 
* commit '195c438883dfcca799aa456dfe52d24c077e40da':
  Fixing bugs in the LLand.
 2014-12-03 17:19:19 +00:00
Jinsuk Kim
5f23693b5c am 3f6755f5: CEC: Check command type for power status monitor action 
* commit '3f6755f58722bbae532171c384a294e530864ae1':
  CEC: Check command type for power status monitor action
 2014-12-03 17:19:14 +00:00
Craig Mautner
418eecb6f8 am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev 
* commit 'dad92f3668c8f153b4be946bed32c338c5fb6317':
  Don't process windows belonging to unshown users
 2014-12-03 17:19:01 +00:00
Lorenzo Colitti
d99cd44f31 am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
  Make StatusBar display all default networks.
 2014-12-03 17:18:52 +00:00
Adrian Roos
f235edf215 Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 2014-12-03 17:13:56 +00:00
Svetoslav
4667d247bb Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 2014-12-03 16:34:00 +00:00
Paul Jensen
7bd8eaf568 Retry failed network validation every 10 minutes. 
This allows for better recovery from ISP outages.

bug:18489123
Change-Id: Iefffe870bd6b7c19827fdbc323024a600a6025f9
 2014-12-03 11:06:14 -05:00
Jason Monk
8d72046b9b Merge "Don't show no sim icon on wifi devices" into lmp-mr1-dev 2014-12-03 14:12:25 +00:00
Daniel Sandler
195c438883 Fixing bugs in the LLand. 
less garish hue on the bugdroid
       :
  +----:-----------+
  | |  : |    Θ.......... improved pop styles
  | |  : @    |    |
  | O  A      |....... occasionally there was no gap to fly
  |      0    O    |   through, creating an unintentional
  | @    |    |    |   commentary on the futility of it all
  +----------------+
     :      :
     :      : animation could continue
     :        after activity pause, sapping
     :        precious cycles
     :
   failure is now more visceral

Bug: 17931806
Change-Id: Iea9bd88e340beb3a0ca310db071ec9f6ec719a33
 2014-12-03 11:53:29 +00:00
Jinsuk Kim
3f6755f587 CEC: Check command type for power status monitor action 
The action was not checking the command type before processing.
Makes sure the right command is given for the rest of the action flow.

Bug: 18592547
Change-Id: Iaf2584501fc70bfc87e00b74f48cb11c6989f283
 2014-12-03 08:06:39 +00:00