Dieter Hsu
02aa04bc2b
Merge "Support AOD in the Universal Settings API" into pi-dev am: 3025bc7c18
...
am: 9180cade44
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
dd5977901d
Merge changes I034a9f0a,Iad5ec577 into pi-dev
...
* changes:
Get rid of UserPackageWrapper util.
Get rid of extra whitespace under divider lines
2018-03-23 17:36:54 +00:00
TreeHugger Robot
06bf8a21c6
Merge "Add summary text for "Automatic system updates" option." into pi-dev
2018-03-23 17:05:20 +00:00
Matthew Fritze
5c5a921efb
Add keywords for search terms
...
A large update for search keywords collected from logging
and individual feedback.
At the moment, we don't have a great way to test that a keyword
matches to a search result. It's a bit akin to testing that the
wifi title is Wifi.
Fixes: 36983488
Fixes: 36622889
Fixes: 76115241
Test: Manual audit of keywords surfacing the proper results.
Change-Id: Ia1031b7f6ec1edfcc28c07e6b55049b8dac7c685
2018-03-23 09:41:47 -07:00
Antoan Angelov
7e866d903e
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev am: 84a4dd0bde
...
am: 3f0b96cd18
2018-03-23 14:26:03 +00:00
Antoan Angelov
84a4dd0bde
Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
2018-03-23 14:10:29 +00:00
Julia Reynolds
9865aaa3fc
Merge "Add manage notifications screen" into pi-dev am: 2c1de66c58
...
am: e76a12526b
2018-03-23 05:21:05 +00:00
Tao Bao
8271220cb6
Add summary text for "Automatic system updates" option.
...
Fixes: 72472580
Test: m -j RunSettingsRoboTests
Test: Build and flash on sailfish. Check the text.
Change-Id: Ied5b307f8c43c0bdccea4996cced483ce54568e7
2018-03-22 21:02:09 -07:00
TreeHugger Robot
2c1de66c58
Merge "Add manage notifications screen" into pi-dev
2018-03-23 02:06:38 +00:00
Julia Reynolds
58edda1230
Merge "Add a setting for the volume hush gesture" into pi-dev am: 395345c0ad
...
am: a7af991f37
2018-03-23 01:09:14 +00:00
Julia Reynolds
ff9500d0f9
Add manage notifications screen
...
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: I1c872c976677ee38f7d9d9523d18fc8ca03fa547
Add manage notifications screen
Test: make -j RunSettingsRoboTests
Bug: 74318867
Change-Id: Ia3626e9f69e8b91b1a2bba9ef549c775972e749a
2018-03-22 19:57:09 -04:00
Fan Zhang
6c5af54af9
Get rid of extra whitespace under divider lines
...
Change-Id: Iad5ec5771a61c6e12aaefbe5fe41d17f7f09de73
Fixes: 76116029
Test: visual
2018-03-22 15:04:01 -07:00
Julia Reynolds
395345c0ad
Merge "Add a setting for the volume hush gesture" into pi-dev
2018-03-22 22:03:48 +00:00
anitalin
8debb12ed0
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev am: 721c58deb4
...
am: a396fdb580
2018-03-22 05:34:31 +00:00
Shawn Ding
50d98df148
Merge "Update "Vibrate on tap" string" into pi-dev am: bad38a1940
...
am: 4d8b920c7e
2018-03-22 05:33:52 +00:00
Andreas Terzis
7130de5fb6
Merge "Add back the data saver preference." into pi-dev am: ce447d9191
...
am: fa50690b29
2018-03-22 05:29:10 +00:00
TreeHugger Robot
721c58deb4
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
2018-03-22 05:05:21 +00:00
TreeHugger Robot
bad38a1940
Merge "Update "Vibrate on tap" string" into pi-dev
2018-03-22 05:03:38 +00:00
