Commit Graph

5657 Commits

Author SHA1 Message Date
Fan Zhang
f75edca09f Revert "Support AOD in the Universal Settings API"
This reverts commit 537c2cfc2c.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
2018-03-29 20:20:31 +00:00
TreeHugger Robot
75f438cc37 Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev 2018-03-29 20:01:26 +00:00
TreeHugger Robot
a673f714c4 Merge "Report unavailable data usage." into pi-dev 2018-03-29 19:57:44 +00:00
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07:00
Jeff Sharkey
70e4117cd1 Merge "Better public volumes handling on secondary users." into pi-dev am: bfc661ea3e
am: 978d2dd575

Change-Id: I17ef1a2163c3df258dd12a0f2c03e37c089c06e2
2018-03-29 18:16:40 +00:00
Victor Chang
4da3a7b5a8 Remove dead code in time zone picker
The codes are unused due to the UX changes in b/73952488

Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Bug: 72376227
Change-Id: I9562e97fe13a3c00f8c142f30af7ca350af10757
2018-03-29 19:01:26 +01:00
Victor Chang
6366a3cc5d Fix ZonePickerSettingsTest due to string change
The change with id I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22 broke the
test

Bug: 76209571
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6676e8669e1f396c9588e3096b62cc6aedcc38a9
2018-03-29 19:01:26 +01:00
Fan Zhang
db139a6a44 Merge "Check time-spent-in-app intent must come from system app." into pi-dev am: 8e88874e47
am: 06a2555802

Change-Id: Ia28178fe8aa5b034bc988506dabb163352dfe3ff
2018-03-29 17:59:01 +00:00
Doris Ling
02b4cf2aca Report unavailable data usage.
- when showing the data usage graph, if the first data point is equal to
the first available data, insert a 0 usage point on the first day of
available data, so that it will show a flat line for the days that do
not have available data instead of showing a non-zero slope.

Change-Id: Ibf305e292a65ab3310ea12efbb575e3a7e1b6012
Fixes: 76155147
Test: make RunSettingsRoboTests
2018-03-29 10:54:54 -07:00
Daniel Nishi
6ff8bbeb4a Merge "Don't allow a zero-length device name to work." into pi-dev 2018-03-29 17:33:27 +00:00
Jeff Sharkey
bfc661ea3e Merge "Better public volumes handling on secondary users." into pi-dev 2018-03-29 17:13:42 +00:00
yuemingw
3005660476 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev am: cc65760354
am: 59b7244dcc

Change-Id: Iff817627897dee78d0f54a0f571703a495e944e9
2018-03-29 17:05:11 +00:00
TreeHugger Robot
8e88874e47 Merge "Check time-spent-in-app intent must come from system app." into pi-dev 2018-03-29 16:55:30 +00:00
TreeHugger Robot
cc65760354 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 2018-03-29 16:45:43 +00:00
Rubin Xu
9d2edcbcbf Remove password blacklist check
Bug: 73750934
Test: compiles
Change-Id: Ic6c40255333d171dc55df479dd6c0004371551b7
2018-03-29 17:26:01 +01:00
yuemingw
6e78482016 Disallow_airplane_mode should not disable mobile network.
Found mobile_network_settings preference is dependent on toggle_airplane
preference so once Disallow_airplane_mode is turned on,  toggle_airplane
preference will be set disabled, and mobile_network_settings preference
is also set disabled because of the dependence. Can fix this bug moving
the dependance and let MobileNetworkPreferenceController listen to
Settings.Global.AIRPLANE_MODE_ON.

Bug: 76468718
Test: manually but TestDpc
Change-Id: I137938766557d7bc5ae0795bc3359a6bfbae17e3
2018-03-29 14:34:33 +01:00
Jyun LuoLai
dbcc3d4176 Let battery status icon has consist UI in PowerSummaryPage
Change-Id: Ia82adb4a964cb63c656c70a7277c76991c6b2505
Fixes: 76219062
Test: Manual test & make RunSettingsRoboTests
2018-03-29 15:52:34 +08:00
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
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
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
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
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
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
025d9d2a47 Fix a NPE when getting ZenMode in RingerMutedCondition.
Change-Id: If9a8b6f4a2d5e9b45402240d8e1401cef7dd001c
Fixes: 77217038
Test: robotest
2018-03-28 16:26:21 -07: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
TreeHugger Robot
8b63a03278 Merge "Remove duplicate classes from test/robotests" into pi-dev 2018-03-28 22:40:45 +00: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
TreeHugger Robot
caf72cf3ff Merge "Fix incorrect GMT offset in display" into pi-dev 2018-03-28 21:05: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
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
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
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

Change-Id: I765c9400804d178c854b92d1650bcf7110c6eec7
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
TreeHugger Robot
512cb18c2e Merge "Get anomaly info from StringArrayList" into pi-dev 2018-03-28 18:58:00 +00:00