Svetoslav Ganov
a0fc968327
am 85a57781: am bb9a2035: This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
...
* commit '85a577817ce618fc490da0876d3b0587b6dcaf5c':
This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
2014-09-04 03:55:09 +00:00
Adam Powell
06e6ef2c9e
am 3d20a2c0: am bc01a3e4: Merge "Fix a regression in SearchView focusability" into lmp-dev
...
* commit '3d20a2c0aebe1faa58e00ccd3b2f3cd5eae20389':
Fix a regression in SearchView focusability
2014-09-04 03:44:43 +00:00
Deepanshu Gupta
0d6350760e
am 3f6958be: am ef798c46: am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
...
* commit '3f6958beaa45a640fb484dcf63f746466a855c3f':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 03:44:38 +00:00
Deepanshu Gupta
f1569ac6d7
am 3424b0f5: am 5e8e34d9: am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
...
* commit '3424b0f50b0566dac383e4371f1695eb7d427121':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 03:44:34 +00:00
Wink Saville
8fec2e4414
Cleanup ISub.aidl
...
Fix copyright and remove @param context
Change-Id: Icf0a7899070f03161db54aac4a83f6dd060bc28d
2014-09-03 20:42:37 -07:00
Svetoslav Ganov
17cf230b0c
am bb9a2035: This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
...
* commit 'bb9a2035bd45c1b6d336044a9976be6fd1aaccbd':
This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
2014-09-04 03:42:17 +00:00
Svetoslav Ganov
588e117cce
This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
...
Revert "NumberPicker not announcing current selection."
This reverts commit 44d026c95bb9e582b7b18e355ec7a3458df52259.
Change-Id: I0bb6db9666fc9eb477737d1114c5c87035ed202b
2014-09-04 03:28:50 +00:00
Deepanshu Gupta
4ac648e03c
am b16739ef: am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev
...
* commit 'b16739efd81f1540ed36cd0f736b8f6d75a77ead':
Remove ANDROID_BUILD_TOP from intelliJ path variables.
2014-09-04 03:23:54 +00:00
Deepanshu Gupta
655ab01b3d
am 332b35fd: am 80899170: Merge "enums in dimension attributes." into lmp-dev
...
* commit '332b35fdc651dc61bc03fda47e0a98252cf66159':
enums in dimension attributes.
2014-09-04 03:23:29 +00:00
Deepanshu Gupta
1efd27c310
am 0b95c63a: am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev
...
* commit '0b95c63a00031dd12e4f4d40239f01eba32793ed':
Null out "@null" attributes.
2014-09-04 03:23:23 +00:00
Deepanshu Gupta
e7b6efdd4a
am 6bb49454: am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev
...
* commit '6bb494548f5ea3daaded54659eebb0bdaca801e6':
LayoutLib: Fix warnings in ResourceHelper.
2014-09-04 03:23:18 +00:00
Deepanshu Gupta
3ff936f333
am b553e8a5: am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev
...
* commit 'b553e8a520d4cda5762b777aee29f80e26f293ed':
LayoutLib: Allow '+' in float attributes.
2014-09-04 03:23:12 +00:00
Deepanshu Gupta
f0bf13cb45
am 8af5cd51: am 229833c3: Merge "Fix invalid conditional check." into lmp-dev
...
* commit '8af5cd512a7d71834e8d31b8b7d6240abe334699':
Fix invalid conditional check.
2014-09-04 03:23:07 +00:00
Deepanshu Gupta
c1b93e47e9
am 3aa86336: am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev
...
* commit '3aa86336981b0b6b443b3235f46d3f1104f2849b':
Build layoutlib_create tests.
2014-09-04 03:23:01 +00:00
Jae Seo
a7a03fa6c7
am 3dd7f2c7: am 9c723776: Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev
...
* commit '3dd7f2c7836add86fa6c6b6be66176ee6c2568a6':
TIF: Add Quebec ratings for Canada and fix the XML example
2014-09-04 03:21:59 +00:00
Adam Powell
b5bbe5745e
am f1197ed9: am c3070461: Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev
...
* commit 'f1197ed9d98716a2bb572efc6960672a55baee79':
Change the CAB to use the up-glyph for closing action modes
2014-09-04 03:21:54 +00:00
Shishir Agrawal
2abe0c0159
am 1f2e8604: am 64fb11a6: Add a config variable to control radio power cycle on SIM refresh reset.
...
* commit '1f2e8604bfed6124cb70db874ed6f6748991874c':
Add a config variable to control radio power cycle on SIM refresh reset.
2014-09-04 03:21:46 +00:00
Deepanshu Gupta
3ce96efc2c
am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
...
* commit 'd181ffe6881d0a1b49193b5f70dac0cc7cc9aae3':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 03:18:39 +00:00
Deepanshu Gupta
638894803c
am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
...
* commit '6530cca1edf79ddcd520e2e5bc2695adfb0d3680':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 03:18:27 +00:00
Alan Viverette
ba9bf41a77
Fix AM/PM text i18n and clean up keyboard support in time picker
...
Also updates date picker to use drawable for the header background to
match the implementation in time picker. The time picker background
now supports showing a focused state ripple.
BUG: 17344077
BUG: 16227517
Change-Id: Ida715badb4a151fc16edd91fd4a0dae32953c99e
2014-09-03 20:14:21 -07:00
Adam Powell
5e82dcc22d
am bc01a3e4: Merge "Fix a regression in SearchView focusability" into lmp-dev
...
* commit 'bc01a3e4b46b1bf02c98b384ee280c8c1cb1a2f2':
Fix a regression in SearchView focusability
2014-09-04 03:01:15 +00:00
Deepanshu Gupta
2f2cc5bb61
am ef798c46: am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
...
* commit 'ef798c4697e53e1cd18066834cfba4fc1595726c':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 03:01:10 +00:00
Deepanshu Gupta
1f52a2abc9
am 5e8e34d9: am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
...
* commit '5e8e34d9d751d582c29fcf91c2462e6f2225fff5':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 03:01:05 +00:00
Adam Powell
a727bf51ed
Merge "Fix a regression in SearchView focusability" into lmp-dev
2014-09-04 02:51:41 +00:00
Deepanshu Gupta
79d91784d1
am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
...
* commit '81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:49:21 +00:00
Deepanshu Gupta
67f8358764
am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
...
* commit 'aac20cfcb4752a38bb27fb134869868c487d855f':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:49:17 +00:00
Adam Powell
ea4ecd6241
Fix a regression in SearchView focusability
...
A bit of code was removed that re-read the View style attributes
during SearchView construction to extract the focusable attribute, but
with a different default value if it was entirely missing. Restore it,
and lump re-reading the focusable attribute in with SearchView's
styleable filter array instead of using the giant View one for a
second time during inflation.
Bug 17292230
Change-Id: Ic5a2dd2d55893b0b290f1f7a3b6de09b37329245
2014-09-03 19:35:37 -07:00
Deepanshu Gupta
81cd0d8d52
am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
...
* commit 'a780eee46244062d699f76875fd05775c2ee92de':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:22:53 +00:00
Deepanshu Gupta
aac20cfcb4
am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
...
* commit '9776312a80f0072bf1d1fe8183e168f7d5879c4c':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:22:43 +00:00
Deepanshu Gupta
6c1bf6b161
am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '2db4037c628c70f6206a05ade4e606e0b47e9f7c':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:15:06 +00:00
Deepanshu Gupta
e73e14fd02
am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '8ed784e2893c79d943b6184d25167ecf72a9a9ed':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:15:02 +00:00
Eric Laurent
5a7e9207f0
AudioManager: only use main looper for AudioPort event handler
...
Bug: 17336373.
Change-Id: I0a9a7012778f99acbf027ec2928ca222954ad0bd
2014-09-03 19:11:39 -07:00
Deepanshu Gupta
d19a56d2db
am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev
...
* commit 'c9d0cb09531f16c5a30337fa71aa4d7ba37a8768':
Remove ANDROID_BUILD_TOP from intelliJ path variables.
2014-09-04 02:08:56 +00:00
Deepanshu Gupta
2db4037c62
am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit '4f53d92c2f10f774cfdcf17ded82551ea19924be':
Resolve color xml attributes properly. [DO NOT MERGE]
2014-09-04 02:02:20 +00:00
Deepanshu Gupta
8ed784e289
am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
...
* commit 'edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
2014-09-04 02:01:59 +00:00
Deepanshu Gupta
622dacdd96
am 80899170: Merge "enums in dimension attributes." into lmp-dev
...
* commit '8089917012e9133eb4d0ff4985c130c70d693b96':
enums in dimension attributes.
2014-09-04 01:57:33 +00:00
Deepanshu Gupta
b336fe02b8
am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev
...
* commit '7d931c01e47b4b4bac658d1628e0deb64308fb67':
Null out "@null" attributes.
2014-09-04 01:57:28 +00:00
Deepanshu Gupta
a6f32b9dd3
am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev
...
* commit '8fbaefb017b164133ac7e4ea87772fead5396374':
LayoutLib: Fix warnings in ResourceHelper.
2014-09-04 01:57:23 +00:00
Deepanshu Gupta
b414caaf1e
am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev
...
* commit '02c6c26dfa188710fc748f3b0cea57122e451cbb':
LayoutLib: Allow '+' in float attributes.
2014-09-04 01:57:18 +00:00
Deepanshu Gupta
9034319865
am 229833c3: Merge "Fix invalid conditional check." into lmp-dev
...
* commit '229833c30bfae115c0691af11e531473f827c453':
Fix invalid conditional check.
2014-09-04 01:57:13 +00:00
Deepanshu Gupta
7b877ae554
am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev
...
* commit '2d5629dff0de6262440682ff73214a7245d40c24':
Build layoutlib_create tests.
2014-09-04 01:57:08 +00:00
Deepanshu Gupta
d181ffe688
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
2014-09-04 01:54:08 +00:00
Deepanshu Gupta
4f53d92c2f
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:53:59 +00:00
Deepanshu Gupta
1eb506aa8c
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
2014-09-04 01:53:49 +00:00
Deepanshu Gupta
a780eee462
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
2014-09-04 01:53:38 +00:00
Deepanshu Gupta
509e5db149
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
2014-09-04 01:53:17 +00:00
Deepanshu Gupta
708df7bc45
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev
2014-09-04 01:51:55 +00:00
Deepanshu Gupta
edc8b8579b
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
2014-09-04 01:50:46 +00:00
Deepanshu Gupta
9776312a80
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
2014-09-04 01:50:28 +00:00
Deepanshu Gupta
47a400131f
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
2014-09-04 01:50:06 +00:00