Fabrice Di Meglio
e4beeb8e3c
Merge "Make Spinner widget aware of layout direction"
2012-06-06 18:27:35 -07:00
Fabrice Di Meglio
38d64c5a95
Make Spinner widget aware of layout direction
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I6ebeee67e3e34271897e14f73b7364b1ae83145a
2012-06-06 18:19:51 -07:00
Christian Robertson
5f85a76e87
am 5cb84d2b: am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
...
* commit '5cb84d2b1d7c89f7b1bdd42f94328bbd89a9d7ce':
New mouse pointer arrow with high res versions. Bug: 6579869
2012-06-06 18:02:45 -07:00
Christian Robertson
5cb84d2b1d
am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
...
* commit '43fa4c5261a732decae3bbfaea2a00f8bb9b709c':
New mouse pointer arrow with high res versions. Bug: 6579869
2012-06-06 17:58:55 -07:00
Christian Robertson
43fa4c5261
Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
2012-06-06 17:56:36 -07:00
Jake Hamby
f2fb9044c5
am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit 'e60a35c156ac9a354ad6434da483b43af20ae4a2':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-06 14:04:07 -07:00
Jake Hamby
e60a35c156
Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
2012-06-06 14:01:24 -07:00
Jake Hamby
004ff5ad2a
DO NOT MERGE: Remove SMS shortcode warning feature.
...
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.
Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1
am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
...
* commit '5ddf003cb2957672038bf1db397422402dce930a':
Revert "Import translations. DO NOT MERGE"
2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2
Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
2012-06-06 13:51:50 -07:00
Dianne Hackborn
20e14948f2
am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:37:57 -07:00
Dianne Hackborn
82811d45ed
am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:33:43 -07:00
Dianne Hackborn
533fce25a2
Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
2012-06-06 13:31:59 -07:00
Eric Fischer
8e62634acd
am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '38987073c1b1a993a727210f981601217d30b899':
Import translations. DO NOT MERGE
2012-06-06 12:40:11 -07:00
Eric Fischer
4328d8bb22
Import translations. DO NOT MERGE
...
Change-Id: I531d75aff0713a0664110bf2c138305b30c84722
2012-06-06 12:08:20 -07:00
Eric Fischer
6a6f746ece
Import translations. DO NOT MERGE
...
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
2012-06-06 12:02:00 -07:00
Dianne Hackborn
636fd528f7
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
...
Okay this isn't entirely docs. I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.
Also changed a log from E to W, since it is not an error.
Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
2012-06-06 11:36:49 -07:00
Adam Powell
b85afc25d5
resolved conflicts for merge of 1178569b to master
...
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
2012-06-05 20:08:41 -07:00
Adam Powell
1178569b26
am f6452d0c: Merge "More fun with MediaRouter" into jb-dev
...
* commit 'f6452d0cac64b72005af330411b5a895f0038312':
More fun with MediaRouter
2012-06-05 19:29:57 -07:00
Adam Powell
f6452d0cac
Merge "More fun with MediaRouter" into jb-dev
2012-06-05 19:27:49 -07:00
Adam Powell
690ffb4e1f
More fun with MediaRouter
...
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.
Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.
Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
2012-06-05 19:15:57 -07:00
Fabrice Di Meglio
6fc225a02f
Merge "Make CheckBox / RadioButton / ToggleButton / Star widgets aware of layout direction"
2012-06-05 17:16:31 -07:00
Fabrice Di Meglio
2842679d34
Make CheckBox / RadioButton / ToggleButton / Star widgets aware of layout direction
...
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)
Change-Id: I8badb57d095c6a0a1d0c82bedf30b02502013ae0
2012-06-05 16:41:18 -07:00
Jake Hamby
2b57c8e0ba
am 321ec19e: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit '321ec19e3e2ac1d1f0609f2f5f5feda90f7a688b':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-05 16:36:19 -07:00
Jake Hamby
b1fc08ca08
DO NOT MERGE: Remove SMS shortcode warning feature.
...
The SMS shortcode warning feature has some usability limitations which need
to be resolved before shipping. Remove the code for JellyBean. It will be
added back to a future release when the feature is complete.
Bug: 6605549
Change-Id: Ifb23d20f30199f242abb8bf7db015232a085c8e3
2012-06-05 12:21:02 -07:00
Eric Fischer
def2d7c5a0
am 1c20cc5c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '1c20cc5c063bf4238309827176bb84b3e512e119':
Import translations. DO NOT MERGE
2012-06-05 10:55:36 -07:00
Eric Fischer
42a51b5e97
Import translations. DO NOT MERGE
...
Change-Id: I2c0e4208bae113f88e4402dded254c7feb66ce25
2012-06-05 10:52:55 -07:00
Eric Fischer
ea97179dec
Import translations. DO NOT MERGE
...
Change-Id: I09dd492b37f4658eabb1d67106da7ed45c51abd6
2012-06-05 10:46:41 -07:00
Eric Fischer
2c36609d90
am bbdf46d8: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'bbdf46d89248d275893dad7b54b20311f1b11792':
Import translations. DO NOT MERGE
2012-06-04 17:35:50 -07:00
Eric Fischer
74bfcb7140
Import translations. DO NOT MERGE
...
Change-Id: I872c1c9680d738b553c009cf2d14260012fc6b82
2012-06-04 17:14:57 -07:00
Eric Fischer
9f929e3bd4
Import translations. DO NOT MERGE
...
Change-Id: Ia697bb2342058f44ac8a2922ed4d3c4c851c1741
2012-06-04 17:09:45 -07:00
Adam Powell
6bef7d6602
am 0681494b: am 995dd13c: Merge "Update ProgressBar assets" into jb-dev
...
* commit '0681494b4e3530c386d0652d782ba8b100b22569':
Update ProgressBar assets
2012-06-04 14:53:47 -07:00
Adam Powell
0681494b4e
am 995dd13c: Merge "Update ProgressBar assets" into jb-dev
...
* commit '995dd13c809f75201b9e7336e00718f356fce12e':
Update ProgressBar assets
2012-06-04 14:49:41 -07:00
Adam Powell
a7aeb61c1f
Update ProgressBar assets
...
Bug 6602341
Change-Id: I1279b26c37a89b7d04fb626574502a3c365b4d4f
2012-06-04 14:33:50 -07:00
Adam Powell
0289de8120
am dd0a64a9: am 757b3c27: Fix ordering of product-specific strings
...
* commit 'dd0a64a9ba1c8536337d69d4de55d5c8b133c75d':
Fix ordering of product-specific strings
2012-06-03 14:56:38 -07:00
Adam Powell
dd0a64a9ba
am 757b3c27: Fix ordering of product-specific strings
...
* commit '757b3c274ef0df765bcbc351a64367ed39e69369':
Fix ordering of product-specific strings
2012-06-03 14:52:59 -07:00
Adam Powell
757b3c274e
Fix ordering of product-specific strings
...
Change-Id: Ic825e13be639731380897b937d80938762fce5ce
2012-06-03 14:46:43 -07:00
Adam Powell
1a18189c96
am bdc17727: am 9b12b4ed: Fix product-specific string declaration
...
* commit 'bdc177271ac8484d92218221a0166a273e6e6a10':
Fix product-specific string declaration
2012-06-03 14:45:14 -07:00
Adam Powell
bdc177271a
am 9b12b4ed: Fix product-specific string declaration
...
* commit '9b12b4edcea9a66357b0483a81b79630d83dc6d9':
Fix product-specific string declaration
2012-06-03 14:40:30 -07:00
Adam Powell
9b12b4edce
Fix product-specific string declaration
...
Change-Id: Ib753995ed7bf47bb6724309370c9b05d65cfd81b
2012-06-03 14:32:04 -07:00
Adam Powell
a55a94bfb3
am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev
...
* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
Add MediaRouter API.
2012-06-03 14:19:07 -07:00
Adam Powell
58e29c0661
am 7c86958d: Merge "Add MediaRouter API." into jb-dev
...
* commit '7c86958d73e7216a92bdfd84fce4440e1def7eaa':
Add MediaRouter API.
2012-06-03 14:14:29 -07:00
Adam Powell
7c86958d73
Merge "Add MediaRouter API." into jb-dev
2012-06-03 14:11:43 -07:00
Jim Miller
988edcd423
am a8c42f1a: am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit 'a8c42f1aaa184ed9b30c747ca03b5d7159a3fb20':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:40:28 -07:00
Adrian Ludwig
74981738ad
am 6169ee6d: am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '6169ee6dcedbac870aa4df92e6c4369614331ce6':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:24 -07:00
Adrian Ludwig
747cc36f22
am 0ec61ff5: am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
...
* commit '0ec61ff561010ef9b4512deffbf66598766172de':
Revert "Update long strings to provide users with more information about permissions."
2012-06-02 08:40:12 -07:00
Adrian Ludwig
11e128ce22
am 2c670142: am c16a199e: Merge "Update long strings to provide users with more information about permissions." into jb-dev
...
* commit '2c6701422e2e35d166195d2135462740bc75a255':
Update long strings to provide users with more information about permissions.
2012-06-02 08:40:09 -07:00
Jim Miller
a8c42f1aaa
am 94a8ae09: Merge "Fix 6592932: add means to replace assist icon from given package" into jb-dev
...
* commit '94a8ae09bea03ec2ca5563601e28a196d41bb6b6':
Fix 6592932: add means to replace assist icon from given package
2012-06-02 08:35:33 -07:00
Adrian Ludwig
6169ee6dce
am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev
...
* commit '2aeaf2345ea0b72322ee301cb4412fa737b594bc':
For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default. It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications. To avoid user confusion, the permission is placed in the development tools group.
Update long strings to provide users with more information about permissions.
2012-06-02 08:35:30 -07:00