Commit Graph

43525 Commits

Author SHA1 Message Date
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
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
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
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
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
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
3025bc7c18 Merge "Support AOD in the Universal Settings API" into pi-dev 2018-03-29 00:13:56 +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
TreeHugger Robot
f9cfc7c75a Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev 2018-03-28 23:02:04 +00:00
TreeHugger Robot
8b63a03278 Merge "Remove duplicate classes from test/robotests" into pi-dev 2018-03-28 22:40:45 +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
TreeHugger Robot
caf72cf3ff Merge "Fix incorrect GMT offset in display" into pi-dev 2018-03-28 21:05:15 +00: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
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
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
Victor Chang
77f97af8eb Fix incorrect GMT offset in display
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place

Bug: 77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
2018-03-28 19:52:05 +01:00
Jan Nordqvist
4092b2193c Entity header: When screen scrolls, there should be shadow under the header.
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests

Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
2018-03-28 11:17:23 -07: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
TreeHugger Robot
c621ddc3f2 Merge "Move BT, NFC out of Conntection pref" into pi-dev 2018-03-28 17:38:34 +00:00
Makoto Onuki
c8db611068 Fix battery saver setting default state
- Battery saver is off by default.

Test: manual test with: settings delete global low_power && settings delete global low_power_trigger_level
Test: b ROBOTEST_FILTER=BatterySaver RunSettingsRoboTests

Bug: 76460719
Change-Id: I749bba9a5e36fe8ccee6e4ed843596bc94d96fcc
Fix: 76460719
2018-03-28 10:23:40 -07: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
TreeHugger Robot
d46cf49b6d Merge "Fix tests for time format in settings" into pi-dev 2018-03-28 16:45:45 +00:00
TreeHugger Robot
bbb3d3e72c Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev 2018-03-28 16:36:16 +00:00
Fan Zhang
ea40291759 Revert "Ignore broken test to unblock TreeHugger"
This reverts commit 54f467f9ad.

Bug: 77161730
Change-Id: Ib93d0cd75a10a8be94dec4f822359c6c492297ea
2018-03-28 15:10:10 +00:00
Fan Zhang
aad168729f Merge "Fix robotest failure" into pi-dev 2018-03-28 15:06:50 +00:00
Rubin Xu
c548977ea1 Confirm parent user's credential when setting lock for profile
When a DPC fires ACTION_SET_NEW_PASSWORD to set a work challenge
for an existing work profile with unified challenge, require the
user to confirm exisiting device lock first. This is not only for
increased security, but also a functionality requirement: the
system can only re-derive the current work profile password needed
by the password change after a fresh confirm credential operation.

Test: Add device lock, create work profile, then execute:
      adb shell su 1010000 am start --user 10 -a android.app.action.SET_NEW_PASSWORD
      Verify the device is prompting for current password.
Bug: 65910682
Change-Id: Ib4b4c88c1551cfff626f707d5f3182160a1ec46c
2018-03-28 16:03:01 +01:00
Artem Iglikov
54f467f9ad Ignore broken test to unblock TreeHugger
Bug: 77161730
Test: make RunSettingsRoboTests -j
Change-Id: If16368d7cbf899dfacf376f33712f68daf2aebf7
2018-03-28 15:52:39 +01: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
Julia Reynolds
2c18bbbd75 Merge "Allow app lists to have a toggle" into pi-dev 2018-03-28 11:21:51 +00: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
Fan Zhang
cbc5239cee Fix robotest failure
Change-Id: Ic584aab213fa7af8f6f79e10743710be6840c2ee
Fixes: 77161730
Test: robotest
2018-03-27 21:43:41 -07: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
Fan Zhang
c4c7ec4a5c Remove duplicate classes from test/robotests
Robolectric now compiles against framework source, the duplicate classes
are no longer necessary

Bug: 76167422
Test: rerun robotest
Change-Id: Iceea1b53c2bd2feef19b5be344db3e4e3e893459
2018-03-27 18:59:32 -07: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
Scott Nien
3f53afdac5 Apply entity header effect to storage summary screen
use EntityHeaderController.styleActionBar to apply the entity header
effect which will not show shadow under the app bar unless it starts to
scroll.
Bug: 71767969
Test: manual test

Change-Id: Iffd94db956d50b8985cfa5df3886acd3b766fd0c
2018-03-28 09:53:44 +08: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
Shawn Ding
a4d78e43c2 Fix data usage under Wi-Fi has title "Mobile data usage"
Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage)

Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e
Fixes: 76165354
Test: Manual test
2018-03-28 07:32:23 +08:00