Commit Graph

2736 Commits

Author SHA1 Message Date
Dieter Hsu
1967396c09 Support AOD in the Universal Settings API am: beb89c3545
am: a52682fe2b

Change-Id: I1a26d7aef5238ee532bedf24aaf26ff9d2d6d0b8
2018-03-30 08:01:29 +00:00
Dieter Hsu
beb89c3545 Support AOD in the Universal Settings API
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I609ac74f70bf040bd9033f421b4bb7c02bf33440
2018-03-30 13:20:56 +08:00
Fan Zhang
de57e7d195 Merge "Register most app info related controllers in xml" into pi-dev am: 4ae4cd5c8d
am: a166a70218

Change-Id: Id5bbbd56766fa3daa6f942834accb2708c88b7f9
2018-03-30 03:35:55 +00:00
LexHuang
cb82c2d6db Support Screen Rotate in the Universal Settings API am: 78df73f00a
am: d6209750b4

Change-Id: If605a7eb94e8ded5879dac96eda0f5c1a16b57a3
2018-03-30 03:25:51 +00:00
TreeHugger Robot
4ae4cd5c8d Merge "Register most app info related controllers in xml" into pi-dev 2018-03-30 03:17:45 +00:00
LexHuang
78df73f00a Support Screen Rotate in the Universal Settings API
Change extend from AbstractPreferenceController to TogglePreferenceControllear

Bug: 67997439
Test: make RunSettingsRoboTests
Change-Id: I86e59d00384fb131f2f2b92186e8536324db2e1b
2018-03-30 02:32:36 +00:00
Fan Zhang
ffb6e93128 Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54
am: 4663e6e52a

Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff
2018-03-30 02:26:45 +00:00
Fan Zhang
24ebab4565 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev am: 9af6688a92
am: 1b176e3332

Change-Id: I5d15b83e4dce008fea16961e80593180cff45057
2018-03-30 01:42:40 +00:00
Fan Zhang
b5c651c939 Register most app info related controllers in xml
Bug: 77216595
Test: robotests
Change-Id: I79afa38820b7518d8b3112148802797ebcf6d184
2018-03-29 17:55:41 -07:00
TreeHugger Robot
0ae4204f54 Merge changes I0fde4f80,Iea1cff48 into pi-dev
* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
2018-03-29 23:49:22 +00:00
TreeHugger Robot
9af6688a92 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev 2018-03-29 23:10:45 +00:00
Fan Zhang
65983f71d5 Update TimezoneInfoPrefController to register in xml
Test: robotest
Bug: 77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
2018-03-29 14:38:44 -07:00
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
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07: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
cc65760354 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 2018-03-29 16:45:43 +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
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
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
Dieter Hsu
3025bc7c18 Merge "Support AOD in the Universal Settings API" into pi-dev 2018-03-29 00:13:56 +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
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
Victor Chang
4aef470537 Merge "Add a header view to show the country in RegionZonePicker" into pi-dev am: 05ab467e80
am: 5aa3b3c3b8

Change-Id: I19213b029819d45b63d7e9584df2e3e83773d367
2018-03-28 18:01:23 +00:00
HJ ChangLiao
6a38e5818b Merge "Move BT, NFC out of Conntection pref" into pi-dev am: c621ddc3f2
am: 941af18fe7

Change-Id: I1d4ceea2b5ac03c5e4b60a93c8e57a686ffe7b5b
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
Jyun LuoLai
21d51728b7 Merge "Subtext of "Add device" should only show when BT is off" into pi-dev am: 671db84734
am: 8b5e2c323b

Change-Id: Ib2fc38a2970df73a9c9afedde503a77c548e82dd
2018-03-28 17:45:43 +00:00
TreeHugger Robot
c621ddc3f2 Merge "Move BT, NFC out of Conntection pref" into pi-dev 2018-03-28 17:38:34 +00: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
Victor Chang
65f09f3091 Add a header view to show the country in RegionZonePicker
Extra fixes in this CL
- Minor string update in time zone picker.
  Use date_time_search_region string in search bar,
  and date_time_set_timezone_title string for lower case "zone".
- Fixed b/76893139. Remove the unnecessary top padding in RecyclerView.
  Create a new layout file time_zone_items_list.xml without the padding.
- Add missing return statement when region ISO code
  is invalid in RegionZonePicker#getAllTimeZoneInfos

Bug: 76209571
Bug: 76893139
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Test: Verified that the strings are updated in the UI
Change-Id: I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22
2018-03-28 15:40:33 +01:00
Jyun LuoLai
41e02a9489 Subtext of "Add device" should only show when BT is off
Bug: 73960246
Test: Manual test & make RunSettingsRoboTests
Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0
2018-03-28 14:26:26 +08:00
Dieter Hsu
537c2cfc2c Support AOD in the Universal Settings API
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I161bc5746573444b284a03de8f5d4d8e510153dc
2018-03-28 02:12:16 +00:00
HJ ChangLiao
b247311b2a Move BT, NFC out of Conntection pref
Move BT, NFC preference out of Connection Preference,
To Connected devices page.
Because NFC and Android Beam are controlled by the same controller,
Create each controller for those preference and leave the sharing part.

Change-Id: I8bc303a5f487de9c667487119b49e1e4130aa80c
Fixes: 72458929
Test: manually test, make RunSettingsRoboTests
2018-03-28 09:55:22 +08:00
Lei Yu
4b96ddb53d Merge "Remove the old battery page" into pi-dev am: 4e25277f60
am: 71333cb477

Change-Id: I166c6de0bd2a7150dbfbbe35783c2fab86c6ed45
2018-03-27 22:46:44 +00:00
TreeHugger Robot
4e25277f60 Merge "Remove the old battery page" into pi-dev 2018-03-27 20:23:23 +00:00
HJ ChangLiao
b945a2a876 Merge "Add title to What to block page" into pi-dev am: 517f6d602d
am: ac4d617706

Change-Id: I4b1d206842370e08e73f32e00404109a55463561
2018-03-27 13:32:12 +00:00
TreeHugger Robot
517f6d602d Merge "Add title to What to block page" into pi-dev 2018-03-27 13:04:03 +00:00
HJ ChangLiao
7fcf157762 Add title to What to block page
Add title to page Sound> Do Not Disturb> What to block
Fixes: 76103812
Test: make RunSettingsRoboTests -j

Change-Id: Iee2679cb94e1447769402d27895b276b8853d97a
2018-03-27 17:47:07 +08:00
yuemingw
5dc9faf1a0 Merge "Auto time should show dynamic subtext when restricted." into pi-dev am: d7ea524e81
am: 8c3bccda2c

Change-Id: Ifc207a8adb1ab1e976d540366c3d1ef29588ebfa
2018-03-27 08:44:30 +00:00
Lei Yu
68ffee1a7d Remove the old battery page
This CL removes PowerUsageSummaryLegacy and PowerUsageAdvancedLegacy
and their related layouts and strigns.

Also remove the isBatteryV2Enabled method in feature provider.

Change-Id: I1ec30f713d733ed24335a3e698fb515751232948
Fixes: 76027338
Test: robo test still pass
2018-03-26 17:40:10 -07:00
yuemingw
3434e72f31 Auto time should show dynamic subtext when restricted.
Auto time preference should show dynamic subtext corresponding to
the current status of auto time when it's restricted, instead of
hard code "enabled by admin", as it could either be enabled or disabled
when disallow_config_date_time is set.

Bug: 73811933
Test: manually by TestDPC
Change-Id: Ia7181e8a67ccfe72117f95133e9081375c121fe3
2018-03-26 20:37:56 +00:00
Fan Zhang
60d7e5fb74 Merge ""My Phone" -> "About Phone"" into pi-dev am: 6ab6ed4e7a
am: bb40b8e157

Change-Id: I3d8c617eec7fc1cf739094d834eede3af785e42a
2018-03-24 07:55:43 +00:00
Fan Zhang
d157f7c846 Merge "Add preference controller to launch app-time-spent UI." into pi-dev am: 30da391fa0
am: 490eaa1c8c

Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
2018-03-24 07:54:54 +00:00
Fan Zhang
6ab6ed4e7a Merge ""My Phone" -> "About Phone"" into pi-dev 2018-03-24 05:16:01 +00:00
TreeHugger Robot
30da391fa0 Merge "Add preference controller to launch app-time-spent UI." into pi-dev 2018-03-24 05:14:32 +00:00
Matthew Fritze
3f0122fa05 Merge "Add keywords for search terms" into pi-dev am: dd0e23b987
am: 49a3169cb4

Change-Id: I16065c59992f75fc9e45be4bd4b313a0691b13be
2018-03-23 21:55:14 +00:00
Fan Zhang
64a8f70a7f Add preference controller to launch app-time-spent UI.
Bug: 74580195
Test: robotests
Change-Id: Iba9338f04cc037a134ef9445ce97cbbe21f53833
2018-03-23 14:13:57 -07:00
Daniel Nishi
1225469ee9 "My Phone" -> "About Phone"
String polishing fix.

Bug: 36458278
Test: Manual
Change-Id: If0d90aa252d0ffe8bdbb8d255d1bec736ba2017a
2018-03-23 14:03:23 -07:00
Fan Zhang
2e1d9e802a Merge changes I034a9f0a,Iad5ec577 into pi-dev am: dd5977901d
am: 7e75de29b1

Change-Id: Ife81eb4fa926cd9a54e84ea4b9d5374c07e1a5b6
2018-03-23 20:03:54 +00:00
Tao Bao
7110bf4cd6 Merge "Add summary text for "Automatic system updates" option." into pi-dev am: 06bf8a21c6
am: 08888b75f8

Change-Id: I8f7d989bad4e605bdfd756afeb873d8fc00031ea
2018-03-23 19:36:57 +00:00
TreeHugger Robot
dd0e23b987 Merge "Add keywords for search terms" into pi-dev 2018-03-23 18:35:23 +00:00