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

149881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
46a8750aee am 4056d9cb: Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev 
* commit '4056d9cb2bd2e2de21b75950a21b5b7cb45df26d':
  Fix matrix multiply in accessiblity display adjustments.
 2014-08-23 00:34:23 +00:00
Jeff Brown
a136c7e068 am d8b20d39: Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* commit 'd8b20d399e1834910fcc3fb502ecbe0d15412510':
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:34:18 +00:00
Jeff Brown
92b506fa17 am 6a276cec: Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 
* commit '6a276cec09dd175d175dfc96f7a703b05300f8c9':
  Poke interactive hint from userActivity and add @SystemApi.
 2014-08-23 00:34:13 +00:00
Jeff Brown
8f7d0e28d5 am 48b8c455: Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 
* commit '48b8c45588fa55e4f92b5db0576a4707124202da':
  Require DEVICE_POWER permission for DOZE_WAKE_LOCK.
 2014-08-23 00:34:08 +00:00
Jeff Brown
7be29436ca am 84ec443d: Merge "Unhide the proximity sensor wakelock." into lmp-dev 
* commit '84ec443d1ab0372f12a56ac5d85ae7cdcae4a943':
  Unhide the proximity sensor wakelock.
 2014-08-23 00:34:03 +00:00
Jeff Brown
d4c3a1f77a Merge "Fix matrix multiply in accessiblity display adjustments." into lmp-dev 2014-08-23 00:24:01 +00:00
Jeff Brown
a96a3c1b65 Merge changes I9bd3a235,I9c4dbdef into lmp-dev 
* changes:
  Improve adaptive brightness in very dark rooms.
  Hide PowerManager methods that third-party apps can't use.
 2014-08-23 00:23:45 +00:00
Jeff Brown
d7761be23d Merge "Poke interactive hint from userActivity and add @SystemApi." into lmp-dev 2014-08-23 00:23:41 +00:00
Jeff Brown
de25dc0708 Merge "Require DEVICE_POWER permission for DOZE_WAKE_LOCK." into lmp-dev 2014-08-23 00:23:26 +00:00
Jeff Brown
2835bb7867 Merge "Unhide the proximity sensor wakelock." into lmp-dev 2014-08-23 00:23:00 +00:00
Jeff Davidson
577bf51765 am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'daf5448383a02017bb761841d675c3630ec94cac':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:12:49 +00:00
Jeff Davidson
8288c5b821 Merge "Restore legacy VPN stats dialog strings." into lmp-dev 2014-08-23 00:03:28 +00:00
Tim Kilbourn
4af6348435 am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit '442bb8f66804cfb9894176e6d4ac5b6c455a4caf':
  Update shadow parameters for television.
 2014-08-22 23:55:47 +00:00
Jeff Davidson
8a5a9d32c2 Restore legacy VPN stats dialog strings. 
Bug: 17164793
Change-Id: I5927cdc4f1ceef4cd1cc1b5d17ae97d285bd9a39
 2014-08-22 16:55:32 -07:00
Guang Zhu
17534d9cd5 am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit 'ed43020e15ac965bb2cc7c53b34848e2b953f2a2':
  add some missing assert messages for wifi test
 2014-08-22 23:51:06 +00:00
Tim Kilbourn
aa6215a0d2 Merge "Update shadow parameters for television." into lmp-dev 2014-08-22 23:45:40 +00:00
Tim Kilbourn
fbc1931d6a Update shadow parameters for television. 
Bug: 15859361
Change-Id: If22767a6aa81f897c0705fa0618c314df27b7dcd
 2014-08-22 16:44:53 -07:00
Adam Lesinski
0ad152edaf am 8ff6f579: Merge "AAPT: Filtering resource fix" into lmp-dev 
* commit '8ff6f57929dfda602030bfba662169cf018f0c7f':
  AAPT: Filtering resource fix
 2014-08-22 23:36:31 +00:00
Guang Zhu
1109c7d4fe Merge "add some missing assert messages for wifi test" into lmp-dev 2014-08-22 23:36:01 +00:00
Adam Lesinski
4bf859a9ec Merge "AAPT: Filtering resource fix" into lmp-dev 2014-08-22 23:25:00 +00:00
Jim Miller
7d95c50fd6 am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9af7f4f66652d659fb17f4bc502362f0e6faf175':
  Update TrustAgentService API after review.
 2014-08-22 23:18:16 +00:00
Elliott Hughes
8821122225 am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit 'fff90ffb6bb113bea6297a7edf97679f4c835763':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:10:04 +00:00
Adam Lesinski
a5cc002bfe AAPT: Filtering resource fix 
Previously, when filtering resources from an APK using
-c option, if one qualifier matched, we would keep the resource.
However, in the case of something like

-c fr-FR,sw360dp

and with a resource in the APK like so

drawable-fr-FR-sw600dp-v13

we would want this resource to be excluded, as it does not
match the sw360dp qualifier (must be less than or equal to it).

This CL fixed the behavior of the filter to require that all
defined qualifier axis be matched.

Bug:17142358
Change-Id: Ie48f3d516a0e610abc7ba8a7ced4eb3ab52534d4
 2014-08-22 16:09:54 -07:00
Jim Miller
c7639333f8 Merge "Update TrustAgentService API after review." into lmp-dev 2014-08-22 23:08:32 +00:00
Elliott Hughes
ed40256670 Merge "Use CLDR narrow am/pm markers." into lmp-dev 2014-08-22 23:02:14 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
John Spurlock
fd7c9500d0 am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'fa0f82886a3074b2990df9354eb320461f44bc50':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:12:10 +00:00
Pat Tjin
1aaeab110f am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 
* commit 'e0eb27c6d4c5e6cf2d9d0f2100a365ae74c3607b':
  SurfaceControl: free ref when not used anymore
 2014-08-22 22:12:05 +00:00
John Spurlock
7653a30ea0 Merge "Display notification effects suppressor in the volume panel." into lmp-dev 2014-08-22 22:09:35 +00:00
Guang Zhu
12747ab3aa add some missing assert messages for wifi test 
Change-Id: I04f4cbbca1a181ab1404fa3abba874e1f78fed3c
 2014-08-22 15:08:36 -07:00
John Spurlock
b4782526f5 Display notification effects suppressor in the volume panel. 
Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
 2014-08-22 18:08:17 -04:00
Pat Tjin
5fa3f3a995 Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 2014-08-22 22:04:37 +00:00
Adam Powell
448f033e78 am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit '2ad136dfb6e40c97a5012c75455fea7b109c2cee':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:23:20 +00:00
Robert Greenwalt
9712405ed8 am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 
* commit '0c9bb058dbb6b615c729d945a7d3547b3e99b39d':
  Add config settings for ethernet/wifi tcp buffers
 2014-08-22 21:23:15 +00:00
Adam Powell
c9991c7149 Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 2014-08-22 21:20:24 +00:00
Robert Greenwalt
acb570cd84 Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 2014-08-22 21:14:34 +00:00
Christopher Tate
b0f1614579 am 887ad9b6: Merge "Automatically bind to newly-installed backup transports" into lmp-dev 
* commit '887ad9b66a2e1c425fac4aeec7b1a773d4394a35':
  Automatically bind to newly-installed backup transports
 2014-08-22 21:14:17 +00:00
Adam Lesinski
e90d91ce5b am f064f669: Merge "AAPT: Dump installLocation in badging" into lmp-dev 
* commit 'f064f6691c5bc415fc5123b7219e3465f3901e20':
  AAPT: Dump installLocation in badging
 2014-08-22 21:14:13 +00:00
Amith Yamasani
dbca3c3121 am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '654d72fd3c12bf0470e88debb0701a949914607e':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:14:10 +00:00
Matthew Williams
e7faa446a9 am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit 'd95fb7b383bf7534ddcaea4aeb76fb00e1f6e7be':
  JobScheduler only run jobs for started users.
 2014-08-22 21:14:05 +00:00
Svetoslav
b5a5235115 am dafdc643: Merge "Fix jank in when drawing magnification bounds" into lmp-dev 
* commit 'dafdc6439f4a8cde3f1b29a94fc6b8c5c47cf6ed':
  Fix jank in when drawing magnification bounds
 2014-08-22 21:14:01 +00:00
ztenghui
07695e87e6 am 2758bafd: Merge "Improve the spot shadow computation." into lmp-dev 
* commit '2758bafd337abdc6a7873ce57185cf130d93dfb7':
  Improve the spot shadow computation.
 2014-08-22 21:13:56 +00:00
Christopher Tate
e7bbe47833 Merge "Automatically bind to newly-installed backup transports" into lmp-dev 2014-08-22 21:11:41 +00:00
Adam Lesinski
37e6cbae59 Merge "AAPT: Dump installLocation in badging" into lmp-dev 2014-08-22 21:09:00 +00:00
Amith Yamasani
6dd08fdd91 Merge "Show a user switching dialog before starting the user switch" into lmp-dev 2014-08-22 21:08:15 +00:00
Matthew Williams
12eec2341d Merge "JobScheduler only run jobs for started users." into lmp-dev 2014-08-22 21:08:06 +00:00
Svetoslav
d9a218d499 Merge "Fix jank in when drawing magnification bounds" into lmp-dev 2014-08-22 21:07:09 +00:00
ztenghui
190ead730f Merge "Improve the spot shadow computation." into lmp-dev 2014-08-22 21:04:49 +00:00
Adam Powell
2b7ff72683 Fix (another) measurement issue in ActionBarContainer 
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
 2014-08-22 13:57:43 -07:00
Elliott Hughes
0b3d2d01d3 am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev 
* commit '973526087efda830993a1f17a588d62930ce4520':
  Don't show the pseudolocales unless we're in developer mode.
 2014-08-22 20:54:45 +00:00