Fan Zhang
2c7a10b34d
Merge changes I236b1124,Iad16b06e into pi-dev am: 6a89e511d1
...
am: 8c7824bc29
Change-Id: Ibaabfbd62a117a04bdffc58bed4112ec35dff829
2018-03-29 05:13:37 +00:00
Andrew Chiang
bf824732b8
Merge "Update toggle text for Data Saver" into pi-dev am: f3ea58a7df
...
am: e469636038
Change-Id: If92eb9056b259965f4f195f2a450ae997eff3c22
2018-03-29 05:06:20 +00:00
Fan Zhang
6546fcb087
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev am: 6b36c2e402
...
am: 6deb639427
Change-Id: I98ae1ded481ee66eb929d8b7a41f8b4d21b08805
2018-03-29 04:54:28 +00:00
Scott Nien
e6e017f4c8
Merge "Apply entity header effect to storage summary screen" into pi-dev am: 27ba675ddd
...
am: 1fd894fd66
Change-Id: Ic3ed430ab27d0bb3bd6d06c1184f464362c11697
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
Change-Id: Icee729e83d50e6447b1872fd4340b7f113fb7ec4
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
Change-Id: I82ae2d375b99bd9c1ae58b2919ed87f02ed18adf
2018-03-29 03:04:11 +00:00
Andrew Chiang
e469636038
Merge "Update toggle text for Data Saver" into pi-dev
...
am: f3ea58a7df
Change-Id: I5119ec416a7c531eaf73fdf5e9c160f17e42b202
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
Change-Id: Ic9bced3c2ec51392cdcf41c15a02adefb8031632
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
Change-Id: Ifad1dbe1fad852fa72ea005c2478cf77c651f79d
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
Change-Id: I0de7b54de332baca2b6f5e8498cfc9c47e98f0ce
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
Change-Id: Ic1b2b4cff34ecb5468420dac9d100e0226914609
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
Change-Id: I7f90cc839366d5edd5af2fed43f5742ac604ceff
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
Change-Id: I315bd95df74389acdbeca5f3715a3e58c872529d
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
Change-Id: I90309ffd96e9668a286a3019691748e319ed6d4f
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
Change-Id: I47b47781a53fc090c0f2e5542e134732922da87b
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
Change-Id: I8198b511255e9e78e7c378adc62886aa4f31fac8
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
Change-Id: I2e82659b4341d3bec2ae0020216f73284c30f7f7
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 -s ours
Change-Id: I7c65b1db09429e68433fe3c781a2c04d884a53fc
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
Change-Id: Ib4a76ca53a04cf9a9f6ab62312bbf3c9b685528c
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
Change-Id: Id8ccf9caa54e655f810d77baf19c7d6df55a9087
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
Change-Id: I055b684dcb5056577e492a6d631c18a186257c4c
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 -s ours
Change-Id: Ia1ae6679a2e3c5c2372bee1280ef8577efa3ef84
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 -s ours
Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
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
Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
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
Change-Id: I71761c96deae57d260d35a7dfcfa3bad90cdea72
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
Change-Id: I65d6cb8508923786606301ed611dd925a9f266b7
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