Commit Graph

15041 Commits

Author SHA1 Message Date
Doris Ling
7acf9a574b Merge "Fix visibility issue with fingerprint icon." into pi-dev
am: 108c5452b5

Change-Id: I2ef0e88b9599b2749e43dc1808d1e4c718c98adc
2018-03-29 23:52:26 +00: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
Julia Reynolds
cb78269637 Update channel DND setting
... to reflect DND changes elsewhere in the system. Update the summary
and make the setting always available.

Test: make -j RunSettingsRoboTests
Change-Id: Ia51c349d863e1470e8a043293fa60f22632fa2df
Fixes: 76137346
2018-03-29 20:55:03 +00: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
Doris Ling
92268fd640 Fix visibility issue with fingerprint icon.
- set icon tint color to control normal. The icon fill color is white,
and without the tint color set, it is invisible on a white background.

Change-Id: I9cda0e9105701230256620bd4ea904c96d7bc166
Fixes: 77151365
Test: visual
2018-03-29 13:08:09 -07:00
Daniel Nishi
2369ad39d8 Polish the About Phone page.
* Move the device name from the 3rd position to the 1st.
* Remove the ripple effect from phone number, IP address, MAC address,
and Bluetooth addresses.

Bug: 77220996
Test: Manual
Change-Id: I009847e751082df6b85d840d01c4c8ae7abd8e10
2018-03-29 12:54:46 -07:00
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07: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
yuemingw
59b7244dcc Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
am: cc65760354

Change-Id: I13c39e2857bc58f6062a5d74ad3c4e672200a029
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

Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865
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
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
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
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
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
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
Lei Yu
18b737af5d Update the battery saver summary
Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: If3866e39c1ab3c9de74b7cabcf8fe6657ca37791
2018-03-28 15:38:33 -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
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
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
5aa3b3c3b8 Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
am: 05ab467e80

Change-Id: I0865b2a8cc8b920e17f8693e5015555f0241762f
2018-03-28 17:55:17 +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
HJ ChangLiao
941af18fe7 Merge "Move BT, NFC out of Conntection pref" into pi-dev
am: c621ddc3f2

Change-Id: I6ab6467b5c93b5d87695c1e919043e0a6a080ab9
2018-03-28 17:47:51 +00:00
TreeHugger Robot
c621ddc3f2 Merge "Move BT, NFC out of Conntection pref" into pi-dev 2018-03-28 17:38:34 +00:00
Jyun LuoLai
8b5e2c323b Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
am: 671db84734

Change-Id: If5da86ea853dd287a23abe67779aa579fdb48bf3
2018-03-28 17:36:41 +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
Bill Yi
4fa5774b90 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-28 17:11:01 +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
Fan Zhang
543bd80a90 Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
am: 0a5367c0c4

Change-Id: I277b4c2123fbe6d08548972883c3e1cd5288a71c
2018-03-28 00:45:43 +00:00
TreeHugger Robot
0a5367c0c4 Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev 2018-03-28 00:05:32 +00:00
Bill Yi
3a98069fd4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie0351c94a04bdafdc0517be7c96dd89a366cfdf6
2018-03-27 15:26:27 -07:00
Lei Yu
71333cb477 Merge "Remove the old battery page" into pi-dev
am: 4e25277f60

Change-Id: Id73aa82818b697cf2754758120a8ff098a68fdd5
2018-03-27 21:11:06 +00:00
TreeHugger Robot
97a1f85291 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-03-27 20:41:16 +00:00
Fan Zhang
8878a957f8 Add "device is muted/vibrate, click to turn on" conditions
Bug: 76022431
Test: robotests
Change-Id: I89b71f99fa5ef866028912183ad04b053213bb0d
2018-03-27 13:31:12 -07:00
TreeHugger Robot
4e25277f60 Merge "Remove the old battery page" into pi-dev 2018-03-27 20:23:23 +00:00
Bill Yi
7764850080 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ife3ef6257d8ade3bcc9689171e4365f639c36440
2018-03-27 11:43:44 -07:00
HJ ChangLiao
ac4d617706 Merge "Add title to What to block page" into pi-dev
am: 517f6d602d

Change-Id: I3e898bf29199164d279f611973459fd67b7f347c
2018-03-27 13:18:51 +00:00