Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,276 Commits 3 Branches 0 Tags
1fb7dc0c00a72f3ded151ea41ec22b9caa3be42e
Commit Graph

151276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
1fb7dc0c00 am e00e0e4e: am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'e00e0e4e0d2b1b2620649c46d483fac38f541b56':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:20:51 +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
Stephen Hines
18e1203945 am c0d6f025: am 007848ad: Merge "We need to specify a target SDK < 21 to use graphics RS." 
* commit 'c0d6f0255c8c94b312429c9b37d6810fbc819a34':
  We need to specify a target SDK < 21 to use graphics RS.
 2014-08-23 00:12:07 +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
321db6f3a4 am 597973c9: am 442bb8f6: Merge "Update shadow parameters for television." into lmp-dev 
* commit '597973c999773f8e42b0b891b0d51e69fe798606':
  Update shadow parameters for television.
 2014-08-23 00:00:05 +00:00
Guang Zhu
90caceb7ee am 1312c106: am ed43020e: Merge "add some missing assert messages for wifi test" into lmp-dev 
* commit '1312c1064a848e8a0049901e8f5cdb63dc1eb729':
  add some missing assert messages for wifi test
 2014-08-22 23:59:36 +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
Stephen Hines
c0d6f0255c am 007848ad: Merge "We need to specify a target SDK < 21 to use graphics RS." 
* commit '007848ad8ef59385cf8dab7081c427911554c457':
  We need to specify a target SDK < 21 to use graphics RS.
 2014-08-22 23:50:21 +00:00
Adam Lesinski
8bff0be090 am fe8c0080: am 8ff6f579: Merge "AAPT: Filtering resource fix" into lmp-dev 
* commit 'fe8c0080fc7610dd61cd82ae6cd256011c0d3c44':
  AAPT: Filtering resource fix
 2014-08-22 23:48:12 +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
Jim Miller
db2fb70b19 am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '752889a944402983874e04da6f613872275aa3d0':
  Update TrustAgentService API after review.
 2014-08-22 23:28:08 +00:00
Adam Lesinski
4bf859a9ec Merge "AAPT: Filtering resource fix" into lmp-dev 2014-08-22 23:25:00 +00:00
Elliott Hughes
49e927ecd6 am 8f038952: am fff90ffb: Merge "Use CLDR narrow am/pm markers." into lmp-dev 
* commit '8f0389527241cb5b8adada12b9084b5c7f38bb84':
  Use CLDR narrow am/pm markers.
 2014-08-22 23:23:52 +00:00
Stephen Hines
007848ad8e Merge "We need to specify a target SDK < 21 to use graphics RS." 2014-08-22 23:21:46 +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
48b9ca16f6 am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:23:15 +00:00
Pat Tjin
59935635a2 am dce17b0f: am e0eb27c6: Merge "SurfaceControl: free ref when not used anymore" into lmp-dev 
* commit 'dce17b0faee9594b31839502966c03504d9684c0':
  SurfaceControl: free ref when not used anymore
 2014-08-22 22:23:11 +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
9971017140 am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 
* commit 'cb3b976da10899bc7cfcc934ebf3eae9fa5d15db':
  Fix (another) measurement issue in ActionBarContainer
 2014-08-22 21:45:38 +00:00
Robert Greenwalt
8fee69be0c am 6aaa0bc2: am 0c9bb058: Merge "Add config settings for ethernet/wifi tcp buffers" into lmp-dev 
* commit '6aaa0bc22b2bd8d6fac750dd4a46322d66804d61':
  Add config settings for ethernet/wifi tcp buffers
 2014-08-22 21:45:35 +00:00
Christopher Tate
21daafd4fc am 63651110: am 887ad9b6: Merge "Automatically bind to newly-installed backup transports" into lmp-dev 
* commit '636511108ad45da699eaaa98a2d337897737cce8':
  Automatically bind to newly-installed backup transports
 2014-08-22 21:24:29 +00:00
Adam Lesinski
587133cf2c am b5a92f26: am f064f669: Merge "AAPT: Dump installLocation in badging" into lmp-dev 
* commit 'b5a92f26b68b9c35ad9a5a86fdee4e21b489bb92':
  AAPT: Dump installLocation in badging
 2014-08-22 21:24:24 +00:00
Amith Yamasani
61b7dff862 am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '0c581229cd4986c07bb877f8211a8c5471633efb':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:24:20 +00:00
Matthew Williams
e94569636f am 74d65044: am d95fb7b3: Merge "JobScheduler only run jobs for started users." into lmp-dev 
* commit '74d65044fda9dedd72a7e80ec9a607bebdf5f484':
  JobScheduler only run jobs for started users.
 2014-08-22 21:24:15 +00:00
Svetoslav
4fbc63eee1 am ddbf2a1f: am dafdc643: Merge "Fix jank in when drawing magnification bounds" into lmp-dev 
* commit 'ddbf2a1f2a03e1818324144df653e60d1e005eaa':
  Fix jank in when drawing magnification bounds
 2014-08-22 21:24:10 +00:00
ztenghui
e509e1d214 am 059c9a56: am 2758bafd: Merge "Improve the spot shadow computation." into lmp-dev 
* commit '059c9a56aac1e1cbe0366b1ec6edc729afbd5855':
  Improve the spot shadow computation.
 2014-08-22 21:24:07 +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