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

175735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2a3ca185bf am 45207128: am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '45207128c5c4f0d1f106af8561bdd156546b0aad':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:07:19 +00:00
Jeff Sharkey
7f9eeaf4c1 am 2f8f394b: resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp 
* commit '2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 20:07:14 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
Jeff Sharkey
2f8f394b14 resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp 
Change-Id: I714b443d66feb7d7416152254d21cac87a6fa451
 2014-12-01 11:57:09 -08:00
Jason Monk
b06a35716d am 0f514474: am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit '0f514474b2c21c17210cec7c812a1c80dd55da19':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 19:54:59 +00:00
Amith Yamasani
bd815f90ca am e434a949: am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit 'e434a94936c8f48bd5158849a09c1e6ce8d6e2d1':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:54:55 +00:00
Geoff Mendal
23dd8ef105 am 2a36f7e3: (-s ours) am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2a36f7e3ab87db68ed0a66f25bc79ebe05139891':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:51 +00:00
John Spurlock
aac7a9f4c7 am 34c9ee1a: am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '34c9ee1af8980594df096e7759c50277270e658c':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:54:45 +00:00
Ihab Awad
6d605377e5 am 984f3c4d: am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev 
* commit '984f3c4df8e5faad5b0ef30649f9ea1f3bc0dc65':
  Telecom API updates (1/6)
 2014-12-01 19:54:40 +00:00
Chet Haase
0d52d01ece am fd942b50: am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit 'fd942b50f120a4530906268ab68ae2ddd4efde01':
  Zero duration animations snap to end value when started
 2014-12-01 19:54:35 +00:00
Geoff Mendal
aa9f2e3729 am 31457ead: (-s ours) am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '31457ead0fd81b8c83da68873c7c0608d43aac7d':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:31 +00:00
Geoff Mendal
5a05252062 am 835e7191: (-s ours) am 11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '835e71910129eb376d40c7bc92ea858b3b76a168':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:27 +00:00
John Spurlock
fc6020c8a9 am f1832e24: am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'f1832e2444d746dae25e64e4f91bd1dc6d2329ce':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:54:22 +00:00
John Spurlock
d101a6e903 am 53da315f: am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit '53da315f1d27885a94fc5435e2593ce7d48f29a9':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 19:54:18 +00:00
John Spurlock
501dd8f4bd am edd0d0ea: am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit 'edd0d0ea98ec1ab662c13db83045191c10235d08':
  Volume: Update remote volume icons.
 2014-12-01 19:54:13 +00:00
Geoff Mendal
59030e32e0 am fe021d5e: (-s ours) am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE 
* commit 'fe021d5ee6af15078a5cfdca2c4ad188fa001d70':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:08 +00:00
Geoff Mendal
8d7b73f042 am fceec9ca: (-s ours) am a990faec: (-s ours) Import translations. DO NOT MERGE 
* commit 'fceec9cad4a7ef69f1960f2c6a0eae56227e828a':
  Import translations. DO NOT MERGE
 2014-12-01 19:54:04 +00:00
Wally Yau
7d64195e50 am 4b187a28: am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit '4b187a28106257638cac25360b8bb59cbf497582':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 19:53:55 +00:00
Elliott Hughes
24946d8143 am 421f826a: am 7ff0b469: am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '421f826a09cf1c278e5b22e2e82ceaf3802992f7':
  Mention ProGuard in the JNI documentation.
 2014-12-01 19:53:51 +00:00
Jason Monk
0f514474b2 am c0c34b42: am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit 'c0c34b428f6d3de635bc832bbebdb7b9cb500ccd':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 19:48:42 +00:00
Amith Yamasani
e434a94936 am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:48:36 +00:00
Geoff Mendal
2a36f7e3ab am e7f81f3b: (-s ours) am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'e7f81f3b684bde04432889943c5085ed1d2b9b1b':
  Import translations. DO NOT MERGE
 2014-12-01 19:48:20 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:47:58 +00:00
Ihab Awad
984f3c4df8 am 8199d6c3: am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev 
* commit '8199d6c3db16d786f15f1d643afe599dcfa6cf1e':
  Telecom API updates (1/6)
 2014-12-01 19:47:23 +00:00
Chet Haase
fd942b50f1 am 8394e9ff: am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '8394e9fff32c8935e021f0e4e84c5c1de913b96f':
  Zero duration animations snap to end value when started
 2014-12-01 19:47:15 +00:00
Geoff Mendal
31457ead0f am 9e863741: (-s ours) am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '9e8637411a2a637e5795ff721ea6a92141cf76ec':
  Import translations. DO NOT MERGE
 2014-12-01 19:47:03 +00:00
Geoff Mendal
835e719101 am 11fe2dfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '11fe2dfd3267c86c598dd443aaf471e8d490b4bb':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:57 +00:00
John Spurlock
f1832e2444 am 64e034e3: am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit '64e034e351ad73b9cb99cb04511d0fea137c7a3b':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 19:46:50 +00:00
John Spurlock
53da315f1d am c1e4d155: am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit 'c1e4d1554f23db7f0de91a212d94a1b624dec64d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 19:46:44 +00:00
John Spurlock
edd0d0ea98 am fdc07dce: am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit 'fdc07dce372e94b274b725ba571c2ad4979565da':
  Volume: Update remote volume icons.
 2014-12-01 19:46:38 +00:00
Geoff Mendal
fe021d5ee6 am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE 
* commit '68137588d1a1924703a2b995b15293515c4ff418':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:31 +00:00
Geoff Mendal
fceec9cad4 am a990faec: (-s ours) Import translations. DO NOT MERGE 
* commit 'a990faec871f4ca369e17c7bd36488747e890bc9':
  Import translations. DO NOT MERGE
 2014-12-01 19:46:24 +00:00
Wally Yau
4b187a2810 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 19:46:11 +00:00
Elliott Hughes
421f826a09 am 7ff0b469: am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '7ff0b469950c225ab3a8a245b6c5ff49ba38497e':
  Mention ProGuard in the JNI documentation.
 2014-12-01 19:45:32 +00:00
Adrian Roos
c8a48293fc am 588d8e46: am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '588d8e46df26631567413c1cb6df3883a49d31c9':
  Fix projection permission dialog layering
 2014-12-01 19:38:17 +00:00
Geoff Mendal
84346fe072 am bcfc5254: (-s ours) am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'bcfc52540692fa11dfc8fb0fe394eafec21cf2f2':
  Import translations. DO NOT MERGE
 2014-12-01 19:38:13 +00:00
Scott Main
b75f22cab3 am 46f0ffa9: am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '46f0ffa99b623b436e56a467d0ba533c6c903b40':
  docs:advmgr-updates
 2014-12-01 19:38:08 +00:00
smain@google.com
17d14a2e30 am 183d9e4a: am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '183d9e4a756f0045881288e51b40002a99b5c1b0':
  define height for context images to avoid content jumps on load
 2014-12-01 19:38:03 +00:00
Narayan Kamath
d198c3269a am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '53651b9982f53236b767d766e85ec0ce3acc6f0f':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:37:59 +00:00
Amit Mahajan
cf45709e5c am 719638af: am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit '719638afea79a3cee77fc75c4c54d36de2ca44a5':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:37:54 +00:00
Adrian Roos
588d8e46df am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '17e0a7e7ac289deacff01c84591dae4009f86415':
  Fix projection permission dialog layering
 2014-12-01 19:33:21 +00:00
Geoff Mendal
bcfc525406 am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'de3f61f46616ed42c03fc8f171324e011ddbcc5d':
  Import translations. DO NOT MERGE
 2014-12-01 19:32:36 +00:00
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
smain@google.com
183d9e4a75 am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'b8de593ec2ca04009835960357c59feff28af551':
  define height for context images to avoid content jumps on load
 2014-12-01 19:32:25 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +00:00
Jeff Sharkey
05d455ca2b am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit 'b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
  Sanitize display names, keep extensions intact.
 2014-12-01 19:00:56 +00:00
Jeff Sharkey
916d516349 am e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 
* commit 'e4a5faa61e9084333b241531ddb941684f110566':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 19:00:51 +00:00
Geoff Mendal
1c9038f260 Merge "Import translations. DO NOT MERGE" 2014-12-01 19:00:46 +00:00
Jeff Sharkey
b9ccc047ca Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 2014-12-01 18:57:09 +00:00