Jeff Brown
dd8e50f4b9
am cf39bdf3: Add support for switching between multiple keyboard layouts.
...
* commit 'cf39bdf3dff5e29447f6ce734b76dc3490385e58':
Add support for switching between multiple keyboard layouts.
2012-05-20 21:53:34 -07:00
Jeff Brown
3ec5724d60
am 51f24302: Support toast cancellation.
...
* commit '51f2430217a377bc2913862d98a97d0087914540':
Support toast cancellation.
2012-05-20 21:53:32 -07:00
Jeff Brown
cf39bdf3df
Add support for switching between multiple keyboard layouts.
...
Also show a notification when an external keyboard is connected
and does not have a keyboard layout selected yet.
Bug: 6405203
Change-Id: Id0ac6d83b3b381f8a236b2244a04c9acb203db3c
2012-05-20 14:56:22 -07:00
Jeff Brown
51f2430217
Support toast cancellation.
...
Change-Id: Idd00b9c6e3049822e437afaf56351575a5c167df
2012-05-20 12:09:37 -07:00
Dianne Hackborn
72669b5f46
am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev
...
* commit '13a0271cb81d497edbf93f3d6ecf4b9b8da4ee69':
Add aapt support for generating proguard rules for onClick methods.
2012-05-18 19:41:10 -07:00
Dianne Hackborn
13a0271cb8
Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev
2012-05-18 19:39:09 -07:00
Dianne Hackborn
9275197d35
Add aapt support for generating proguard rules for onClick methods.
...
Also fix Activity menu inflater when using the dark on light
theme wrapper to still be able to find onClick listeners.
Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d
2012-05-18 19:23:19 -07:00
The Android Open Source Project
099a220cf5
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Iee6bef177dbec906e617d85f0c508d80e77eb64c
2012-05-18 18:42:17 -07:00
Dianne Hackborn
944d624fc2
am 35013d0e: Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev
...
* commit '35013d0e8be6b67c6a0161b8472496a825657944':
DO NOT MERGE: Remove a few left-over layout direction things.
2012-05-18 18:06:27 -07:00
Dianne Hackborn
35013d0e8b
Merge "DO NOT MERGE: Remove a few left-over layout direction things." into jb-dev
2012-05-18 18:04:11 -07:00
Romain Guy
86ed8bfa5e
am 52fcdd01: Merge "Fix documentation" into jb-dev
...
* commit '52fcdd013943954e4baa4542f78557da33bc646b':
Fix documentation
2012-05-18 17:40:37 -07:00
Adam Powell
ed4b91f2e7
am 52bfe0ff: Merge "Sentence case is the best case. Just Once is not a special case." into jb-dev
...
* commit '52bfe0ff519a646b033306f90d0c4d2f605fb5bd':
Sentence case is the best case. Just Once is not a special case.
2012-05-18 17:36:47 -07:00
Craig Mautner
8fcfdd39dd
am 255632d1: Merge "Prevent dim surface from flashing." into jb-dev
...
* commit '255632d16064bf8e65b1773c4f0884267b9ec93f':
Prevent dim surface from flashing.
2012-05-18 17:36:44 -07:00
Romain Guy
52fcdd0139
Merge "Fix documentation" into jb-dev
2012-05-18 17:34:42 -07:00
Dianne Hackborn
39af624f31
DO NOT MERGE: Remove a few left-over layout direction things.
...
Change-Id: Id66b171594af939df4716aa0e0baa25fe47eecee
2012-05-18 17:34:06 -07:00
Romain Guy
c301e78c78
am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev
...
* commit '9579bf821ea4c1c5435f8e62973acd9b72c7902c':
Gallery, we need to talk...
2012-05-18 17:33:05 -07:00
Adam Powell
52bfe0ff51
Merge "Sentence case is the best case. Just Once is not a special case." into jb-dev
2012-05-18 17:32:52 -07:00
Craig Mautner
255632d160
Merge "Prevent dim surface from flashing." into jb-dev
2012-05-18 17:32:48 -07:00
Romain Guy
d2aed40a37
Fix documentation
...
Change-Id: Id3a5d3b6b43ce684c2328f046e4991e64e97575a
2012-05-18 17:32:08 -07:00
Romain Guy
9579bf821e
Merge "Gallery, we need to talk..." into jb-dev
2012-05-18 17:29:58 -07:00
Adam Powell
265f1c7b00
Sentence case is the best case. Just Once is not a special case.
...
Bug 6459691
Change-Id: Iaf90d51258047f4469f0f74470ae699f2fef07ba
2012-05-18 17:22:28 -07:00
Craig Mautner
067ca32a52
Prevent dim surface from flashing.
...
This fix keeps the dim surface below the highest shown layer. If
two shown layers were both dim it was ambiguous where the dim surface
would appear causing dialogs to first be dimmed and then flash when
the dim was put behind them.
Fixes bug 6497476.
Change-Id: I360cf2d23d58fc4c03edbbed16d79c08c29e48b9
2012-05-18 17:19:51 -07:00
Mathias Agopian
92432b6553
am 2598a5c8: Merge "drop frame in case of error in updateTexImage" into jb-dev
...
* commit '2598a5c89fb8c0a9315097657ac688f2b28e5ae8':
drop frame in case of error in updateTexImage
2012-05-18 17:11:24 -07:00
Romain Guy
5a418c771d
Gallery, we need to talk...
...
Change-Id: Ie4b62df03c27161565d303d11447e3d7ff3115c4
2012-05-18 17:09:53 -07:00
Mathias Agopian
2598a5c89f
Merge "drop frame in case of error in updateTexImage" into jb-dev
2012-05-18 17:09:10 -07:00
Mathias Agopian
df071486e0
drop frame in case of error in updateTexImage
...
Bug: 6476587
Change-Id: I864a7d0997761150a3db2ddd5890ed820d792e56
2012-05-18 16:58:00 -07:00
Raphael Moll
f67f834a9c
am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
...
* commit '8748399f6f999d21eef9226baadb20f71dfb61ea':
Support a new ANDROID_AAPT_IGNORE env var.
2012-05-18 16:33:14 -07:00
Jean-Baptiste Queru
38e34874a8
am 2a9b85d7: am c0f17383: Merge "Move kxml2 to prebuilts/misc"
...
* commit '2a9b85d7ccdd3b8e6be90454cdcb4be3b032cd64':
Move kxml2 to prebuilts/misc
2012-05-18 16:33:10 -07:00
Romain Guy
1b61dc2eb7
am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593 " into jb-dev
...
* commit '43a760ba84a5357bae792a33ad4a0e946f02679c':
Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593
2012-05-18 16:27:20 -07:00
Romain Guy
43a760ba84
Merge "Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593 " into jb-dev
2012-05-18 16:25:41 -07:00
Dianne Hackborn
c5fe47376c
am fb5c3dba: Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
...
* commit 'fb5c3dba4ddac023cfd4cdcabdfdbcf343197c94':
Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
2012-05-18 16:09:51 -07:00
Raphael Moll
8748399f6f
am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
...
* commit '613945011ef9f79388a1cf21acf514154e2d5af2':
Support a new ANDROID_AAPT_IGNORE env var.
2012-05-18 16:00:04 -07:00
Jean-Baptiste Queru
2a9b85d7cc
am c0f17383: Merge "Move kxml2 to prebuilts/misc"
...
* commit 'c0f17383579cf49f897fdd1d55aaf44b8d6be0da':
Move kxml2 to prebuilts/misc
2012-05-18 16:00:00 -07:00
Dianne Hackborn
9beee6ad20
am d51ac09f: Merge "Fix activity resolver, issues #6519130 and #6507239 " into jb-dev
...
* commit 'd51ac09fd7db5d810452138749f9291617c0dbf7':
Fix activity resolver, issues #6519130 and #6507239
2012-05-18 15:59:55 -07:00
Justin Ho
321213a6c6
am 00d1c3a7: Merge "Updating default wallpaper." into jb-dev
...
* commit '00d1c3a7b174f9b17270730302a3732cda7f6f64':
Updating default wallpaper.
2012-05-18 15:59:53 -07:00
Jeff Sharkey
40bd46aefd
am 9cb660fa: Merge "Guard against apps breaking CHOOSER contract." into jb-dev
...
* commit '9cb660fa342488cd8550644b5649436f1f7868ee':
Guard against apps breaking CHOOSER contract.
2012-05-18 15:59:51 -07:00
Dianne Hackborn
bcb7f04a7c
am e312c61f: Merge "Improve fitSystemWindows() documentation." into jb-dev
...
* commit 'e312c61f9320c3feb4cfbfcab781a65ee5a417af':
Improve fitSystemWindows() documentation.
2012-05-18 15:59:48 -07:00
Jeff Sharkey
17bee29b1f
am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev
...
* commit '787c9ec558a06bb8ebcb5a77f5268cedd218fd1b':
Transition from DEV network stats to XT.
2012-05-18 15:59:46 -07:00
Romain Guy
d568e4d2ac
am 196a7dae: Merge "Sanitize display list properties" into jb-dev
...
* commit '196a7dae6387b118f73c78b7ae16ebfa604ae249':
Sanitize display list properties
2012-05-18 15:59:44 -07:00
Elliott Hughes
a4cae2847e
am 4b51e293: Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev
...
* commit '4b51e293d86d60dc651c409ae0e25078a2170740':
Fix the preloaded-classes tool for JellyBean.
2012-05-18 15:59:41 -07:00
Daniel Sandler
5f0d6063fa
am 7e22a223: Merge "Updated disconnected rssi icons." into jb-dev
...
* commit '7e22a223afa63c591ef56cb325163e5e82046822':
Updated disconnected rssi icons.
2012-05-18 15:59:39 -07:00
Dianne Hackborn
fb5c3dba4d
Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
...
...when resource is aliased
We were not correctly using the final resolved configuration when
retrieving a drawable through Resources.getDrawable(). (It already
does the correct behavior when going through TypedArray.getDrawable()).
Change-Id: I9032b788b592412178e31e2e6b0181b92c20fe45
2012-05-18 15:51:27 -07:00
Romain Guy
dddcd22b7e
Don't crash on Surface.unlockAndPost() but log & try again
...
Bug #6482593
Change-Id: Ib477b58e2b7a6cb19a87d05f2aa0448e04d82f7c
2012-05-18 15:33:57 -07:00
Dianne Hackborn
d51ac09fd7
Merge "Fix activity resolver, issues #6519130 and #6507239 " into jb-dev
2012-05-18 15:14:41 -07:00
Dianne Hackborn
5320eb8938
Fix activity resolver, issues #6519130 and #6507239
...
6519130: Starting ResolverActivity with no arguments crashes system_server
6507239: ResolverActivity may bypass signature permissions
Change-Id: I64534f781bc6b7eb45e85dbe3a55d351ee28e85c
2012-05-18 15:04:53 -07:00
Winson Chung
90503c116f
Updating default wallpaper.
...
Change-Id: I18273a7c6b50473f3a6cd9554c69c0125a1fa3b5
2012-05-18 14:59:18 -07:00
Daniel Sandler
53c493d60f
cherry-picked w/conflicts: ce77ce1d2b2cd99e2b14695542098af37b2943db
2012-05-18 14:59:01 -07:00
Michael Jurka
c2b8f947b4
Fix issue where static wallpaper was offset on boot
...
Bug: 6447391
Change-Id: Ie89bfdfd81dbf80ad7d109717f83c4bc7b42acf1
2012-05-18 14:53:48 -07:00
Justin Ho
00d1c3a7b1
Merge "Updating default wallpaper." into jb-dev
2012-05-18 14:38:59 -07:00
Winson Chung
23c87915d9
Updating default wallpaper.
...
Change-Id: I18273a7c6b50473f3a6cd9554c69c0125a1fa3b5
2012-05-18 14:37:03 -07:00