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

115016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
9c437bcb57 am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:31:27 -07:00
Adam Lesinski
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev 
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
 2013-09-26 10:27:55 -07:00
Winson Chung
3948e45d6e am 5161b018: am 8fe3097c: Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 
* commit '5161b01893d372e1141e781a219391074a2ee1cb':
  Add QuickSettings all-caps override for certain locales. (Bug 10518893)
 2013-09-26 10:24:13 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Winson Chung
5161b01893 am 8fe3097c: Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 
* commit '8fe3097c87fad3bec6fd53606fe8ff7076bef173':
  Add QuickSettings all-caps override for certain locales. (Bug 10518893)
 2013-09-26 10:20:49 -07:00
Winson Chung
8fe3097c87 Merge "Add QuickSettings all-caps override for certain locales. (Bug 10518893)" into klp-dev 2013-09-26 17:17:18 +00:00
Zhijun He
fd128ff0d6 am b208861e: am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 
* commit 'b208861ef74442ff888e1aaed61b95077364d685':
  Camera2: Fix Camera integration test deadlock
 2013-09-26 10:12:09 -07:00
Zhijun He
b208861ef7 am aea8ec1a: Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 
* commit 'aea8ec1a73ddf594cb295459916ab5b77820f061':
  Camera2: Fix Camera integration test deadlock
 2013-09-26 10:09:28 -07:00
Zhijun He
aea8ec1a73 Merge "Camera2: Fix Camera integration test deadlock" into klp-dev 2013-09-26 17:06:49 +00:00
Daniel Sandler
ecaeabe33a am d90db953: am 87c6d876: Merge "Updated quick settings assets." into klp-dev 
* commit 'd90db9534c52c77f7ceaabcd5607ec4138b3a39c':
  Updated quick settings assets.
 2013-09-26 09:56:58 -07:00
Daniel Sandler
d90db9534c am 87c6d876: Merge "Updated quick settings assets." into klp-dev 
* commit '87c6d8766ea3e591adc270cefc1976b46768bce2':
  Updated quick settings assets.
 2013-09-26 09:54:16 -07:00
Mindy Pereira
cf0bb77861 am cc81ed0f: am b198115e: Merge "De-blue the add lock screen widget pressed state" into klp-dev 
* commit 'cc81ed0f51cfa5580a8d457e8915adc8bf98a776':
  De-blue the add lock screen widget pressed state
 2013-09-26 09:53:23 -07:00
Mindy Pereira
c9b3c0802d am cde76858: am d993cda2: Merge "De-blue notification backgrounds" into klp-dev 
* commit 'cde768582cef5091807718dde298ad1a587106ea':
  De-blue notification backgrounds
 2013-09-26 09:53:20 -07:00
Daniel Sandler
87c6d8766e Merge "Updated quick settings assets." into klp-dev 2013-09-26 16:51:22 +00:00
Mindy Pereira
cc81ed0f51 am b198115e: Merge "De-blue the add lock screen widget pressed state" into klp-dev 
* commit 'b198115e492c390537ec400caa96baab1ccec5b9':
  De-blue the add lock screen widget pressed state
 2013-09-26 09:50:46 -07:00
Mindy Pereira
cde768582c am d993cda2: Merge "De-blue notification backgrounds" into klp-dev 
* commit 'd993cda22ab9062d4badeeeb12ec7ddf38a16be9':
  De-blue notification backgrounds
 2013-09-26 09:50:43 -07:00
Mindy Pereira
b198115e49 Merge "De-blue the add lock screen widget pressed state" into klp-dev 2013-09-26 16:47:59 +00:00
Dianne Hackborn
f17b69e58b am 63cff11b: am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit '63cff11b8aa42efe849c84b8fc74be7c2f354075':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:47:44 -07:00
Mindy Pereira
d993cda22a Merge "De-blue notification backgrounds" into klp-dev 2013-09-26 16:47:44 +00:00
Dianne Hackborn
63cff11b8a am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when resetting app prefs" into klp-dev 
* commit 'c222f57b5c992fb661b7112a7cd5e5dbe1c6030c':
  Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs
 2013-09-26 09:45:10 -07:00
Dianne Hackborn
c222f57b5c Merge "Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs" into klp-dev 2013-09-26 16:41:14 +00:00
Dianne Hackborn
8828d3a153 Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs 
Add a new array indicating whether each op allows itself to
be reset, and use it.

Change-Id: I494f630bda170e061196a380563512e9e77b51a8
 2013-09-26 09:40:19 -07:00
Mindy Pereira
4faf288254 De-blue the add lock screen widget pressed state 
Change-Id: Ie823a20be0a6f78e11cfdc2b2458351957aaec70
 2013-09-25 20:35:47 -07:00
Ari Sachter-Zeltzer
02b0e87077 am 57fc59ec: am c31f1188: Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 
* commit '57fc59ecc2ce59bbda5521284123f6ae8838f3b7':
  deblue btn_cab_done_pressed_holo_*
 2013-09-25 20:20:28 -07:00
Ari Sachter-Zeltzer
57fc59ecc2 am c31f1188: Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 
* commit 'c31f118825778cff15a1c1b9d1171f2ad178a013':
  deblue btn_cab_done_pressed_holo_*
 2013-09-25 20:18:34 -07:00
Ari Sachter-Zeltzer
c31f118825 Merge "deblue btn_cab_done_pressed_holo_*" into klp-dev 2013-09-26 03:16:24 +00:00
Baligh Uddin
9f68b13fcb am 736c7f44: (-s ours) am 1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '736c7f44b1bb0d4e27d65ddc9d514a4b43b840cb':
  Import translations. DO NOT MERGE
 2013-09-25 19:59:28 -07:00
Baligh Uddin
d05612d375 am d90bf6de: (-s ours) am bed6522a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd90bf6de29a12d681d75988b71f78c4c1d948a8b':
  Import translations. DO NOT MERGE
 2013-09-25 19:59:24 -07:00
Baligh Uddin
736c7f44b1 am 1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '1ffe09e2f1db4c5e4b89c19be8b810721c9dc212':
  Import translations. DO NOT MERGE
 2013-09-25 19:56:31 -07:00
Baligh Uddin
d90bf6de29 am bed6522a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bed6522a69dedf4f33568efb48a7b277a70fb35a':
  Import translations. DO NOT MERGE
 2013-09-25 19:56:28 -07:00
Baligh Uddin
e1242178f9 Merge "Import translations. DO NOT MERGE" 2013-09-26 02:55:22 +00:00
Baligh Uddin
50749a8043 Merge "Import translations. DO NOT MERGE" 2013-09-26 02:55:11 +00:00
Baligh Uddin
8d14311f08 Merge "Import translations. DO NOT MERGE" 2013-09-26 02:55:02 +00:00
Baligh Uddin
5a242f59be Merge "Import translations. DO NOT MERGE" 2013-09-26 02:54:45 +00:00
Baligh Uddin
1ffe09e2f1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-26 02:53:59 +00:00
Baligh Uddin
bed6522a69 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-26 02:53:54 +00:00
Jim Miller
c40a3032cb am 27d8ea4e: am 1962e264: Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target 
* commit '27d8ea4e912429930a212412ee2eee07a1c6fb4f':
  Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target
 2013-09-25 19:44:10 -07:00
Jim Miller
27d8ea4e91 am 1962e264: Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target 
* commit '1962e264660b37b7e386eb2ac84fc915dd7c75dd':
  Fix keyguard widget pager accessibility - announce when widget hovers over drop target - announce when widget leaves drop target
 2013-09-25 19:42:22 -07:00
Zhijun He
7b7a154026 Camera2: Fix Camera integration test deadlock 
The problem was: when SurfaceTexture is used, test didn't acquire/release
images when they are produced, then it starves the producer and
cause deadlock. This change replaces SurfaceTexture with ImageReader, release
every image produced immediately.

Bug: 10360518
Change-Id: I9aabaee23013277c2da6f5825ac931bc10511fbc
 2013-09-25 19:33:31 -07:00
Jim Miller
1962e26466 Fix keyguard widget pager accessibility 
- announce when widget hovers over drop target
- announce when widget leaves drop target

Fixes bug 10151121

Change-Id: Ia36400f4e8651149590e004b82f66d43c9deaa08
 2013-09-25 19:29:02 -07:00
Rob Tsuk
3440fa156a am 48b2c775: am 7e391cb8: Merge "Replace blue pressed feedback with gray." into klp-dev 
* commit '48b2c775d5a59d98375b8db49fdff1618709e58d':
  Replace blue pressed feedback with gray.
 2013-09-25 18:52:05 -07:00
Rob Tsuk
48b2c775d5 am 7e391cb8: Merge "Replace blue pressed feedback with gray." into klp-dev 
* commit '7e391cb8acc36eb7a9f489e60e127ca8dfab37ac':
  Replace blue pressed feedback with gray.
 2013-09-25 18:49:31 -07:00
Rob Tsuk
7e391cb8ac Merge "Replace blue pressed feedback with gray." into klp-dev 2013-09-26 01:45:01 +00:00
Ari Sachter-Zeltzer
ce0fe7f2a2 deblue btn_cab_done_pressed_holo_* 
Change-Id: Iff3faa91e36d0b19ebf5c166e44e29145b8493b1
 2013-09-25 18:37:17 -07:00
Baligh Uddin
5d664a88a3 Import translations. DO NOT MERGE 
Change-Id: I62b9f7c427120385654ef8538aac6642d9517029
Auto-generated-cl: translation import
 2013-09-25 17:40:27 -07:00
Ari Sachter-Zeltzer
6f7be89b32 am 61050196: am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev 
* commit '61050196dd4f54159b67dbfd3a0bf3225eb7747a':
  removing unused kg_* assets from fbc
 2013-09-25 17:34:10 -07:00
Ari Sachter-Zeltzer
61050196dd am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev 
* commit 'a53b854103c06f194a1883275d5cdfd78882a248':
  removing unused kg_* assets from fbc
 2013-09-25 17:31:11 -07:00
Ari Sachter-Zeltzer
a53b854103 Merge "removing unused kg_* assets from fbc" into klp-dev 2013-09-26 00:26:29 +00:00
Baligh Uddin
96d361b600 Import translations. DO NOT MERGE 
Change-Id: Iaba381a83f71203a74f396903c384605b7c173a1
Auto-generated-cl: translation import
 2013-09-25 17:20:15 -07:00
Baligh Uddin
976df296f4 Import translations. DO NOT MERGE 
Change-Id: I8d908dee86b15624d846ab335337b88b371ed5d5
Auto-generated-cl: translation import
 2013-09-25 17:19:25 -07:00