Fabrice Di Meglio
a8549041cc
am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev
...
* commit '8c2e3a412aaee8359a48265a101ca27e7b67301c':
Optimize RTL properties resolution
2013-05-06 11:11:03 -07:00
Svetoslav
b0675df8fd
am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
...
* commit 'faa47b526fc35be01b1bc46a78679adde87f6701':
Idle maintenance scheduling broken.
2013-05-06 11:10:57 -07:00
Adam Powell
f581b533cf
am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
...
* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
Fix a NPE in MenuItemImpl when setting null ActionProvider
2013-05-06 08:44:33 -07:00
Fabrice Di Meglio
8c2e3a412a
Merge "Optimize RTL properties resolution" into jb-mr2-dev
2013-05-04 00:48:12 +00:00
Fabrice Di Meglio
09ecb255a6
Optimize RTL properties resolution
...
- dont bother children about resolving RTL properties if the ViewGroup parent
has not done anything
Change-Id: Iedf8a337097e04e1ab0054d59fc347e06b347ea7
2013-05-03 17:33:31 -07:00
Svetoslav
faa47b526f
Merge "Idle maintenance scheduling broken." into jb-mr2-dev
2013-05-03 23:33:09 +00:00
Svetoslav
6a08a12b8e
Idle maintenance scheduling broken.
...
1. The scheduling was relying on receiving battery level broadcasts
which however are not sent if the device is asleep. The maintenance
window was not bound and we could miss a frame if the user did
not interact the device longer than the min time between two
maintenance windows.
2. Hide the idle maintenance intents since this will be rewritten
to user services.
bug:8688454
Change-Id: I17b421b09823cb46ec218cabda19e02432d94f8c
2013-05-03 14:03:06 -07:00
Adam Powell
2b662e8ef9
Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
2013-05-03 18:58:35 +00:00
Satoshi Kataoka
ee0a5fafa7
am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into jb-mr2-dev
...
* commit '245a3e1c1ed265a13d07000ef6e786ec321b85c4':
Change the initial disabled state of disabled IMEs
2013-05-03 11:19:01 -07:00
Jeff Brown
f87d4ea77a
am 17cf4e4d: Merge "Really make Surface thread-safe." into jb-mr2-dev
...
* commit '17cf4e4d4a576009efbfce93bd64b687601b71c7':
Really make Surface thread-safe.
2013-05-03 11:18:58 -07:00
Adam Powell
dcc55855bc
Fix a NPE in MenuItemImpl when setting null ActionProvider
...
Change-Id: I00be010b2197d0f41d0e45b3814474d3ad0c3295
2013-05-03 11:03:10 -07:00
Satoshi Kataoka
245a3e1c1e
Merge "Change the initial disabled state of disabled IMEs" into jb-mr2-dev
2013-05-03 02:34:39 +00:00
Jeff Brown
17cf4e4d4a
Merge "Really make Surface thread-safe." into jb-mr2-dev
2013-05-03 02:11:03 +00:00
Satoshi Kataoka
ed1cdb24ba
Change the initial disabled state of disabled IMEs
...
Bug: 8365223
This change is a supplement for I77f01c70610d82ce9070d4a
The disabled state of disabled pre-installed imes should be changed
to ENABLED_STATE_DISABLED_UNTIL_USED on boot or user switch.
Change-Id: If8ff1b2b95c36d33148def2ab87bd006aa520cc0
2013-05-02 17:53:17 +09:00
Amith Yamasani
f5a553a427
am 55a08c5a: Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev
...
* commit '55a08c5ab91014eb42ecdc9e7039c7bae1f00058':
Allow requiredForAllUsers to work on updates to system apps
2013-05-01 21:27:14 -07:00
Amith Yamasani
55a08c5ab9
Merge "Allow requiredForAllUsers to work on updates to system apps" into jb-mr2-dev
2013-05-02 04:26:01 +00:00
Jeff Brown
f2930d783a
am c3112608: Merge "Don\'t dump sql bindargs unless verbose mode is requested." into jb-mr2-dev
...
* commit 'c31126088fea61a9b5ba6cdb1fd2791e86800a8a':
Don't dump sql bindargs unless verbose mode is requested.
2013-05-01 17:54:34 -07:00
Jeff Brown
c31126088f
Merge "Don't dump sql bindargs unless verbose mode is requested." into jb-mr2-dev
2013-05-02 00:52:26 +00:00
Amith Yamasani
0d8750d771
Allow requiredForAllUsers to work on updates to system apps
...
Bug: 8736380
Also set the default type as the constructor docs imply in RestrictionEntry.
Change-Id: I446504fad8822804d68f09b45ef62f6d79c4b8df
2013-05-01 15:31:49 -07:00
Jeff Brown
cefeb29d53
Don't dump sql bindargs unless verbose mode is requested.
...
Bug: 8780126
Change-Id: I88e238f9d684cc76731207e75370cbb2e0e476c5
2013-05-01 15:28:37 -07:00
Jeff Brown
fc0ebd7d37
Really make Surface thread-safe.
...
There were many places where the native object was being
accessed improperly. Also some places where CloseGuard might
not be acquired or released correctly or where the generation
count might not be updated.
Fixed them all.
That said, Surface isn't intended to be used concurrently
so please don't do it. This is only intended to make
hard to find crashes less likely.
Bug: 8328715
Change-Id: I981ef33425823e0fd7ad6b64443f2ec9b0c8335e
2013-05-01 15:28:01 -07:00
Elliott Hughes
c255800fb0
am 6d82f86f: Merge "Show CJK dates as all-numeric in the DatePicker."
...
* commit '6d82f86fa01800ee0523743366e0dc1113178fd9':
Show CJK dates as all-numeric in the DatePicker.
2013-05-01 14:53:28 -07:00
Elliott Hughes
949e9df25b
Show CJK dates as all-numeric in the DatePicker.
...
Before, we'd have something like 2006 4月12. After, we have 2006 4 12.
The alternative would require using custom NumberPicker.Formatter instances
for the year and day fields in these locales, and that seems significantly
more disruptive.
Bug: 8766552
Change-Id: I568578aae2f80f2acfc53cd277ef3beae6743472
2013-05-01 14:12:05 -07:00
Romain Guy
fa4eb085c3
am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436 " into jb-mr2-dev
...
* commit 'b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
Prevent TextureView from ever setting a null layer paint Bug #8760436
2013-04-30 18:16:11 -07:00
Romain Guy
b107b7e9ec
Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436 " into jb-mr2-dev
2013-05-01 01:14:41 +00:00
Casey Burkhardt
dd7d8ec17e
am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
...
* commit '203aa72e747794a64a8262ceb6c9cdc8381e77cb':
Rebuilds ActionBar accessibility description as needed
2013-04-30 17:20:12 -07:00
Casey Burkhardt
203aa72e74
Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
2013-05-01 00:15:44 +00:00
Chet Haase
8afd195d47
am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev
...
* commit '6b313da0d89564711acfc8c66b7790da0f52d187':
Clarify behavior of fullscreen mode and softInputMode's adjustResize
2013-04-30 16:42:33 -07:00
Casey Burkhardt
8452a7f2f6
Rebuilds ActionBar accessibility description as needed
...
Previously, ActionBarView only updated the contentDescription for the navigate
up/home affordance when it is enabled or disabled. This causes that description
to be rebuilt and applied whenever the title or subtitle of the view is changed.
This also inadvertantly removes whitespace in ActionBarView.
Bug: 8757286
Change-Id: I1ea02cad20e0d5c0c57d071727cc647c4dd52d44
2013-04-30 16:05:56 -07:00
Alan Viverette
a7fa0079a7
am 561dcc58: Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
...
* commit '561dcc5823eec20c48d116531556b32e9de66f91':
Avoid crash when TextToSpeech calls onInit() from the constructor.
2013-04-30 14:04:13 -07:00
Elliott Hughes
76c643c9b6
am e3f2735f: Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
...
* commit 'e3f2735fcfd8dafd226200d5cf219a6f82c9cc0c':
when locale is non-Enligh, sometimes month spinner needs a number IME
2013-04-30 13:21:22 -07:00
Romain Guy
55828af26c
am 6628ee7a: Merge "HeaderViewListAdapter: Correct thrown error names."
...
* commit '6628ee7a46a56cdc28d409e6fd74afc34bd24c5b':
HeaderViewListAdapter: Correct thrown error names.
2013-04-30 13:21:19 -07:00
Elliott Hughes
e3f2735fcf
Merge "when locale is non-Enligh, sometimes month spinner needs a number IME"
2013-04-30 20:11:50 +00:00
Elliott Hughes
a99595a393
am afe56810: Merge "Fix DatePicker\'s spinner order in various locales."
...
* commit 'afe56810517a4ddfad125029ca04fd4cc5af2ef5':
Fix DatePicker's spinner order in various locales.
2013-04-30 12:15:06 -07:00
Elliott Hughes
c2639e58fa
am 0bb4c701: Merge "Use ICU for getDateFormatOrder."
...
* commit '0bb4c701bab0f69172417b7a511acb6bdfa052db':
Use ICU for getDateFormatOrder.
2013-04-30 12:15:00 -07:00
Romain Guy
6628ee7a46
Merge "HeaderViewListAdapter: Correct thrown error names."
2013-04-30 19:11:22 +00:00
Taylor H. Perkins
62b2bb80f6
HeaderViewListAdapter: Correct thrown error names.
...
When accessing an invalid entry of the list, an IndexOutOfBounds exception is thrown, not an ArrayIndexOutOfBounds exception.
Change-Id: I3cf59faab004fa6391d84f30f280e0c9bd92dc44
Signed-off-by: Taylor H. Perkins <taylorhp@gmail.com >
2013-04-30 12:04:52 -07:00
Elliott Hughes
afe5681051
Merge "Fix DatePicker's spinner order in various locales."
2013-04-30 18:40:01 +00:00
Elliott Hughes
0bb4c701ba
Merge "Use ICU for getDateFormatOrder."
2013-04-30 18:22:18 +00:00
Romain Guy
efb709adfe
Prevent TextureView from ever setting a null layer paint
...
Bug #8760436
DO NOT MERGE
Change-Id: I7e4d09fa534f539cb99ebeaa8159fb11920460cf
2013-04-30 11:13:00 -07:00
Elliott Hughes
659f145278
Fix DatePicker's spinner order in various locales.
...
DatePicker always effectively uses yyyy MMM dd, so we need to ask
icu4c what order those should appear in for the user's locale. The
existing DateFormat code was an approximation that worked for en_US
but not for all languages (fa being one example).
Bug: 7207103
Change-Id: I7b12568dbc02522ebad6e1db5f8426109cd6f7ce
2013-04-30 11:11:53 -07:00
Elliott Hughes
edd6f9e688
Use ICU for getDateFormatOrder.
...
Bug: 7207103
Change-Id: I680bb727cb74cd4b050f237f036d9e696201fc0b
2013-04-30 11:09:53 -07:00
Chet Haase
6b313da0d8
Merge "Clarify behavior of fullscreen mode and softInputMode's adjustResize" into jb-mr2-dev
2013-04-30 14:45:46 +00:00
Kenny Root
e9ae6822a8
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
...
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
2013-04-29 23:09:03 -07:00
John Reck
be53f1806c
am 28d91bdb: Merge "Revert "Can not mark the same content of browser page after copy""
...
* commit '28d91bdbde63ba1afe3bb67c5466527ec7184217':
Revert "Can not mark the same content of browser page after copy"
2013-04-29 22:53:57 -07:00
Kenny Root
1f6e789b7e
Merge "Track change to JSSE provider"
2013-04-30 04:02:01 +00:00
John Reck
28d91bdbde
Merge "Revert "Can not mark the same content of browser page after copy""
2013-04-30 01:21:31 +00:00
John Reck
8717061f5b
Revert "Can not mark the same content of browser page after copy"
...
This reverts commit 2b3cef0dd7
Causes crashes in Email, reverting for now
Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c
2013-04-30 01:17:15 +00:00
Alan Viverette
561dcc5823
Merge "Avoid crash when TextToSpeech calls onInit() from the constructor." into jb-mr2-dev
2013-04-30 01:11:08 +00:00
Chet Haase
45c89c2fad
Clarify behavior of fullscreen mode and softInputMode's adjustResize
...
Fullscreen window's will not resize when the keyboard comes on screen,
regardless of the setting of the window's softInputMode field. This fix
clarifies the docs to make this behavior more obvious.
Issue #8754615 Clarify behavior of adjustResize and fullscreen interaction
Change-Id: Ie056db4e328cefaf0edb54fe8cfa7a08f320c8d0
2013-04-29 16:04:40 -07:00