Scott Nien
e6e017f4c8
Merge "Apply entity header effect to storage summary screen" into pi-dev am: 27ba675ddd
...
am: 1fd894fd66
2018-03-29 04:28:09 +00:00
TreeHugger Robot
77448157f7
Merge "Fix the first link is not visible in the supported links"
2018-03-29 04:05:17 +00:00
Jane Chiang
b2f7a325b4
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
...
am: 01933aa02c
2018-03-29 03:24:18 +00:00
Jane Chiang
01933aa02c
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
2018-03-29 03:20:35 +00:00
Jane Chiang
a2860a488d
Reduce size of 'GB' and '%' in storage settings.
...
Test: Manual
Fixes: 62548317
Change-Id: I5ff8ff8c463c2718e48bf04731924922bc0ecc9c
2018-03-29 11:07:08 +08:00
Fan Zhang
8c7824bc29
Merge changes I236b1124,Iad16b06e into pi-dev
...
am: 6a89e511d1
2018-03-29 03:04:11 +00:00
Andrew Chiang
e469636038
Merge "Update toggle text for Data Saver" into pi-dev
...
am: f3ea58a7df
2018-03-29 03:02:49 +00:00
Vincent Peng
f3f9ddc684
Merge "Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence"
2018-03-29 02:51:02 +00:00
TreeHugger Robot
6a89e511d1
Merge changes I236b1124,Iad16b06e into pi-dev
...
* changes:
Add conformance test for preference controller constructor
Remove duplicate framework classes/robotest compile stub
2018-03-29 02:48:21 +00:00
Andrew Chiang
f3ea58a7df
Merge "Update toggle text for Data Saver" into pi-dev
2018-03-29 02:44:04 +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
Fan Zhang
6deb639427
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
...
am: 6b36c2e402
2018-03-29 02:05: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
Scott Nien
1fd894fd66
Merge "Apply entity header effect to storage summary screen" into pi-dev
...
am: 27ba675ddd
2018-03-29 01:50:53 +00:00
TreeHugger Robot
6b36c2e402
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
2018-03-29 01:23:41 +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
Fan Zhang
b803a23031
Check time-spent-in-app intent must come from system app.
...
Change-Id: Ie73aacdaf919b336d99a296328c2fbb4f75036b0
Fixes: 74580195
Test: robotests
2018-03-28 18:15:58 -07:00
Scott Nien
27ba675ddd
Merge "Apply entity header effect to storage summary screen" into pi-dev
2018-03-29 01:07:46 +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
Fan Zhang
92ca05e15e
Add conformance test for preference controller constructor
...
BasePreferenceController's constructor must be in a certain format in
order to work with search and slice. This test enforces that.
Change-Id: I236b11248b09ce71f052c449d39e994c84981a06
Fixes: 77216595
Test: robotests
2018-03-28 17:51:05 -07:00
Fan Zhang
e1398d1350
Remove duplicate framework classes/robotest compile stub
...
Bug: 76167422
Test: robotests
Change-Id: Iad16b06e54bd7290fd363c3abebdb8c66434c0e2
2018-03-28 17:51:05 -07: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
Fan Zhang
025d9d2a47
Fix a NPE when getting ZenMode in RingerMutedCondition.
...
Change-Id: If9a8b6f4a2d5e9b45402240d8e1401cef7dd001c
Fixes: 77217038
Test: robotest
2018-03-28 16:26:21 -07: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
Daniel Nishi
103b4d4619
Don't allow a zero-length device name to work.
...
Technically, if a device has a zero-length device name, the bug will
resurface. The EditText validator doesn't trigger on opening -- only
when the text is edited. A zero-length device name is flagged as being
invalid, but that fails if the text box starts empty.
By pre-filling it with the previous device name, we can ensure that, as
long as a zero-length device name is never set, it can never be set.
Change-Id: I0d28aaae09f99b7d697b753835ba39c0c06644a1
Fixes: 73127912
Test: Robotest
(cherry picked from commit b216550944
2018-03-28 23:00:03 +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
Fan Zhang
2223050dc8
Add some debug logging
...
- Increase logging in SettingsActivity's onCreate and launch fragment
flow.
- Log class name when enable/disable tiles
Bug: 75030092
Test: logcat
Change-Id: Ieb00228562a79c12aba2198021ece505bc371b58
2018-03-28 15:39:07 -07:00
Lei Yu
18b737af5d
Update the battery saver summary
...
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: If3866e39c1ab3c9de74b7cabcf8fe6657ca37791
2018-03-28 15:38:33 -07:00
Daniel Nishi
3c6627d894
Better public volumes handling on secondary users.
...
Public volumes are only mounted for a single user at a time, so only
show notifications and launch Intents for the relevant user.
Test: RunSettingsRobotest
Bug: 73642796
Change-Id: Ic386ec03598ab8968b75320be7844b6ac7f1387b
2018-03-28 15:31:17 -07:00
TreeHugger Robot
6fa3b89033
Merge "Move IMS registration state to SIM status screen" into pi-dev
2018-03-28 22:24:30 +00:00
Lei Yu
1050c49cd2
Update battery strings
...
1. restriction strings in App Info page
2. restriction strings in Dialog
3. restriction summary
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I35f45f2923cda6380c4498ebb9e0923e6f92e46a
2018-03-28 14:53:01 -07: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
