Daniel Sandler
97ccf4a852
am 90497c18: Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev
...
* commit '90497c18f72cf3d7ea2fd611502d0da2c9c69879':
Remotable view method for TextView.setTextSize(int, float).
2012-05-21 12:14:05 -07:00
Daniel Sandler
90497c18f7
Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev
2012-05-21 12:12:13 -07:00
Daniel Sandler
7264f71399
Remotable view method for TextView.setTextSize(int, float).
...
The only remotable method on TextView is setTextSize(float)
which assumes "sp" dimensions, making it tricky to get exact
text sizes.
Bug: 6519374
Change-Id: I961bbdd607ca6786c0630ff1ce19186f54f6f31f
2012-05-21 14:51:51 -04:00
Philip Milne
464c4e9879
am bfa3d50b: Merge "Doc changes for GridLayout." into jb-dev
...
* commit 'bfa3d50b49a93a7d02f93c9ac54a74c40c6f2046':
Doc changes for GridLayout.
2012-05-21 11:36:05 -07:00
Philip Milne
bfa3d50b49
Merge "Doc changes for GridLayout." into jb-dev
2012-05-21 11:33:21 -07:00
Romain Guy
169ff0199b
am d7e4ae48: Merge "Update AsyncTask documentation" into jb-dev
...
* commit 'd7e4ae48c576d5aaef75754b29a8b87c1f0d6427':
Update AsyncTask documentation
2012-05-21 10:49:24 -07:00
Philip Milne
b65408fc0f
Doc changes for GridLayout.
...
Add some javadoc to explain orientation property properly.
Change-Id: I1e2092f32fe2f524eda7d1c46c6daad571733c1f
2012-05-21 10:46:56 -07:00
Romain Guy
2c1b8c744d
Update AsyncTask documentation
...
Change-Id: I678506309f027bb12d0c3f42436a60611aca5d8c
2012-05-21 10:43:26 -07:00
Chris Wren
56a02e6e61
am 29bb6d92: Support more items in the Notification.InboxStyle, plus an overflow.
...
* commit '29bb6d925bcaa562212b3fe41de249c3dfb64354':
Support more items in the Notification.InboxStyle, plus an overflow.
2012-05-21 10:19:26 -07:00
Chris Wren
29bb6d925b
Support more items in the Notification.InboxStyle, plus an overflow.
...
Bug: 6500113
Change-Id: I9f6b45ef0821c45000afa8a23ee51033b51df298
2012-05-21 07:56:58 -07:00
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
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
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
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
Romain Guy
5a418c771d
Gallery, we need to talk...
...
Change-Id: Ie4b62df03c27161565d303d11447e3d7ff3115c4
2012-05-18 17:09:53 -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
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
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
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
Jeff Sharkey
9cb660fa34
Merge "Guard against apps breaking CHOOSER contract." into jb-dev
2012-05-18 14:20:02 -07:00
Jeff Sharkey
1c29700c5f
Guard against apps breaking CHOOSER contract.
...
Bug: 6520937
Change-Id: I677a644cf7765bbb046f9c82e1ebd8a40968cee6
2012-05-18 13:55:47 -07:00
Dianne Hackborn
e312c61f93
Merge "Improve fitSystemWindows() documentation." into jb-dev
2012-05-18 12:55:05 -07:00
Jeff Sharkey
787c9ec558
Merge "Transition from DEV network stats to XT." into jb-dev
2012-05-18 11:40:42 -07:00
Dianne Hackborn
d5333f9289
Improve fitSystemWindows() documentation.
...
Change-Id: I6528f2530e6514344e454510f2fa037b55daebb7
2012-05-18 11:23:32 -07:00
Matthew Xie
fbeb823031
am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev
...
* commit 'dabb19fcd1b0d7b2c21be37aa0b75df5e35f1d6f':
Increase the setup-sdp delay to cover for all the devices.
2012-05-17 21:52:04 -07:00
Matthew Xie
dabb19fcd1
Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev
2012-05-17 21:49:55 -07:00
John Reck
1f00a987ac
am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev
...
* commit '88b756cd249d1dd4aefb92a73a65fa76cd8ef0d5':
Don't show the touch highlight for double taps
2012-05-17 20:05:49 -07:00
John Reck
88b756cd24
Merge "Don't show the touch highlight for double taps" into jb-dev
2012-05-17 20:03:17 -07:00
John Reck
aa5af8d004
Don't show the touch highlight for double taps
...
Bug: 6490959
Change-Id: I5a6cfa3d36f1df28d9c3b03e120f59581ee22c01
2012-05-17 19:57:08 -07:00
Romain Guy
09528f96f4
am c8c4ced8: Merge "Call invalidate() immediately when a frame is available" into jb-dev
...
* commit 'c8c4ced83872f3eeabd93da34d8376903c42a00b':
Call invalidate() immediately when a frame is available
2012-05-17 19:06:31 -07:00
Romain Guy
c8c4ced838
Merge "Call invalidate() immediately when a frame is available" into jb-dev
2012-05-17 19:04:51 -07:00
Dianne Hackborn
ccf4e2f71b
am abe39277: Merge "Fix issue #6515427 : Add android.hardware.television and fix..." into jb-dev
...
* commit 'abe3927701c0aff839498272565aeee714aa6e9d':
Fix issue #6515427 : Add android.hardware.television and fix...
2012-05-17 18:20:50 -07:00