Vincent Peng
f3f9ddc684
Merge "Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence"
2018-03-29 02:51:02 +00:00
Dieter Hsu
02aa04bc2b
Merge "Support AOD in the Universal Settings API" into pi-dev am: 3025bc7c18
...
am: 9180cade44
2018-03-29 02:38:34 +00:00
Philip P. Moltmann
6943d0d547
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev am: f9cfc7c75a
...
am: 4280a00341
2018-03-29 01:58:45 +00:00
Fan Zhang
c9b47afad3
Merge "Remove duplicate classes from test/robotests" into pi-dev am: 8b63a03278
...
am: e2f9e63a2a
2018-03-29 01:16:24 +00:00
Doris Ling
5e63efee2e
Merge "Move IMS registration state to SIM status screen" into pi-dev am: 6fa3b89033
...
am: ab8d5cc02b
2018-03-29 01:01:55 +00:00
Dieter Hsu
9180cade44
Merge "Support AOD in the Universal Settings API" into pi-dev
...
am: 3025bc7c18
2018-03-29 00:42:11 +00:00
Victor Chang
283fcbc43c
Merge "Fix incorrect GMT offset in display" into pi-dev am: caf72cf3ff
...
am: b074d0640c
2018-03-29 00:29:59 +00:00
Dieter Hsu
3025bc7c18
Merge "Support AOD in the Universal Settings API" into pi-dev
2018-03-29 00:13:56 +00:00
Philip P. Moltmann
4280a00341
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
...
am: f9cfc7c75a
2018-03-28 23:59:30 +00:00
vincentpeng
665b16bbfc
Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence
...
"CharSequence is more correct" than String.
Change method to take in CharSequence parameter and modify callers/tests.
Bug: b/74960034
Test: RunSettingsRoboTests:DataUsageSummaryPreferenceTest and RunSettingsRoboTests:DataUsageSummaryPreferenceControllerTest
Change-Id: Ic83bde57bafff8416c0bd86b1ff2beb44ea12d0e
2018-03-29 07:48:10 +08:00
Fan Zhang
e2f9e63a2a
Merge "Remove duplicate classes from test/robotests" into pi-dev
...
am: 8b63a03278
2018-03-28 23:26:59 +00:00
Kousuke Kitahara
e008845287
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours am: 7d906895e8 -s ours
...
am: 072a60c8c3
2018-03-28 23:24:03 +00:00
Doris Ling
ab8d5cc02b
Merge "Move IMS registration state to SIM status screen" into pi-dev
...
am: 6fa3b89033
2018-03-28 23:21:31 +00:00
TreeHugger Robot
f9cfc7c75a
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
2018-03-28 23:02:04 +00:00
Victor Chang
b074d0640c
Merge "Fix incorrect GMT offset in display" into pi-dev
...
am: caf72cf3ff
2018-03-28 22:53:29 +00:00
TreeHugger Robot
8b63a03278
Merge "Remove duplicate classes from test/robotests" into pi-dev
2018-03-28 22:40:45 +00:00
TreeHugger Robot
6fa3b89033
Merge "Move IMS registration state to SIM status screen" into pi-dev
2018-03-28 22:24:30 +00:00
Jan Nordqvist
3dd6e733ed
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev am: 00a2dcb8f9
...
am: 976280308d
2018-03-28 21:15:38 +00:00
Kousuke Kitahara
072a60c8c3
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours
...
am: 7d906895e8
2018-03-28 21:13:08 +00:00
TreeHugger Robot
caf72cf3ff
Merge "Fix incorrect GMT offset in display" into pi-dev
2018-03-28 21:05:15 +00:00
Kousuke Kitahara
7d906895e8
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
...
am: e8b70d7422
2018-03-28 20:49:50 +00:00
Jan Nordqvist
976280308d
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
...
am: 00a2dcb8f9
2018-03-28 20:40:15 +00:00
Fan Zhang
ad55f8dd80
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev am: 8482455df7
...
am: f08dd43f2a
2018-03-28 20:36:56 +00:00
Makoto Onuki
5ed0d7177d
Merge "Fix battery saver setting default state" into pi-dev am: 856017f915
...
am: 4cd5487e11
2018-03-28 20:30:11 +00:00
Philip P. Moltmann
ef99b7d0ef
A18y: Don't double announce 'searching for printers.'
...
Change-Id: I0c0f904aae8345e725a34d38ecf1eb45c3c11670
Fixes: 67323891
Test: Navigated to screen with talkback
2018-03-28 13:13:20 -07:00
TreeHugger Robot
00a2dcb8f9
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
2018-03-28 20:12:46 +00:00
Fan Zhang
f08dd43f2a
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
...
am: 8482455df7
2018-03-28 20:07:23 +00:00
Doris Ling
649751a4a8
Move IMS registration state to SIM status screen
...
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Fixes: 66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests
Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
2018-03-28 13:01:33 -07:00
Makoto Onuki
4cd5487e11
Merge "Fix battery saver setting default state" into pi-dev
...
am: 856017f915
2018-03-28 20:00:45 +00:00
Treehugger Robot
e8b70d7422
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
2018-03-28 19:51:28 +00:00
TreeHugger Robot
8482455df7
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
2018-03-28 19:41:24 +00:00
Lei Yu
4571dfccfb
Merge "Get anomaly info from StringArrayList" into pi-dev am: 512cb18c2e
...
am: 7952ddd062
2018-03-28 19:33:25 +00:00
TreeHugger Robot
856017f915
Merge "Fix battery saver setting default state" into pi-dev
2018-03-28 19:31:51 +00:00
Lei Yu
7952ddd062
Merge "Get anomaly info from StringArrayList" into pi-dev
...
am: 512cb18c2e
2018-03-28 19:22:12 +00:00
TreeHugger Robot
512cb18c2e
Merge "Get anomaly info from StringArrayList" into pi-dev
2018-03-28 18:58:00 +00:00
Victor Chang
77f97af8eb
Fix incorrect GMT offset in display
...
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place
Bug: 77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
2018-03-28 19:52:05 +01:00
Jan Nordqvist
4092b2193c
Entity header: When screen scrolls, there should be shadow under the header.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
2018-03-28 11:17:23 -07:00
Victor Chang
4aef470537
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev am: 05ab467e80
...
am: 5aa3b3c3b8
2018-03-28 18:01:23 +00:00
Victor Chang
5aa3b3c3b8
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
...
am: 05ab467e80
2018-03-28 17:55:17 +00:00
HJ ChangLiao
6a38e5818b
Merge "Move BT, NFC out of Conntection pref" into pi-dev am: c621ddc3f2
...
am: 941af18fe7
2018-03-28 17:53:50 +00:00
TreeHugger Robot
05ab467e80
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
2018-03-28 17:49:36 +00:00
HJ ChangLiao
941af18fe7
Merge "Move BT, NFC out of Conntection pref" into pi-dev
...
am: c621ddc3f2
2018-03-28 17:47:51 +00:00
Jyun LuoLai
21d51728b7
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev am: 671db84734
...
am: 8b5e2c323b
2018-03-28 17:45:43 +00:00
Bill Yi
8d5c12f213
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4fa5774b90 -s ours
...
am: 24346f619e
2018-03-28 17:44:00 +00:00
TreeHugger Robot
c621ddc3f2
Merge "Move BT, NFC out of Conntection pref" into pi-dev
2018-03-28 17:38:34 +00:00
Jyun LuoLai
8b5e2c323b
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
...
am: 671db84734
2018-03-28 17:36:41 +00:00
Bill Yi
24346f619e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 4fa5774b90
2018-03-28 17:28:34 +00:00
Makoto Onuki
c8db611068
Fix battery saver setting default state
...
- Battery saver is off by default.
Test: manual test with: settings delete global low_power && settings delete global low_power_trigger_level
Test: b ROBOTEST_FILTER=BatterySaver RunSettingsRoboTests
Bug: 76460719
Change-Id: I749bba9a5e36fe8ccee6e4ed843596bc94d96fcc
Fix: 76460719
2018-03-28 10:23:40 -07:00
TreeHugger Robot
671db84734
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
2018-03-28 17:22:25 +00:00
Bill Yi
4fa5774b90
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-28 17:11:01 +00:00
