Victor Chang
8995e8d9f6
Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev
...
am: 75f438cc37
2018-03-29 20:15:08 +00:00
Doris Ling
4395decf14
Merge "Report unavailable data usage." into pi-dev
...
am: a673f714c4
2018-03-29 20:14:04 +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
0169765b4f
Merge "Add some debug logging" into pi-dev
...
am: f3789adffd
2018-03-29 18:12:46 +00: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
TreeHugger Robot
f3789adffd
Merge "Add some debug logging" into pi-dev
2018-03-29 17:59:40 +00:00
Daniel Nishi
49058e92c7
Merge "Don't allow a zero-length device name to work." into pi-dev
...
am: 6ff8bbeb4a
2018-03-29 17:55:11 +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
Jeff Sharkey
978d2dd575
Merge "Better public volumes handling on secondary users." into pi-dev
...
am: bfc661ea3e
2018-03-29 17:45:08 +00: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
Fan Zhang
06a2555802
Merge "Check time-spent-in-app intent must come from system app." into pi-dev
...
am: 8e88874e47
2018-03-29 17:22:29 +00:00
Jeff Sharkey
bfc661ea3e
Merge "Better public volumes handling on secondary users." into pi-dev
2018-03-29 17:13:42 +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
yuemingw
59b7244dcc
Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
...
am: cc65760354
2018-03-29 16:53:38 +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
Beverly
020117e9ba
Merge "Settings should use Oxford comma" into pi-dev
...
am: 51646b5f07
2018-03-29 16:09:50 +00:00
TreeHugger Robot
51646b5f07
Merge "Settings should use Oxford comma" into pi-dev
2018-03-29 15:41:21 +00: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
Beverly
bf4f4bf4ad
Settings should use Oxford comma
...
Test: manual
Change-Id: Ie4edd64d423ce96ce097e91f9f5a31bb4339774c
Fixes: 77230158
2018-03-29 09:30:54 -04:00
Rubin Xu
95970db0fa
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
...
am: b0a35de10b
2018-03-29 08:49:24 +00:00
Rubin Xu
b0a35de10b
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
2018-03-29 08:35:46 +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
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
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
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
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
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
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
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
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
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
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
