Commit Graph

43994 Commits

Author SHA1 Message Date
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
4fcb862c95 Merge "Allow app lists to have a toggle" into pi-dev
am: 2c18bbbd75

Change-Id: Id4debc1b5bb0be97615193eeebc51050442daf86
2018-03-28 11:29:33 +00:00
Julia Reynolds
2c18bbbd75 Merge "Allow app lists to have a toggle" into pi-dev 2018-03-28 11:21:51 +00:00
Kousuke Kitahara
d42af71001 DO NOT MERGE Move IMS registration state to SIM status screen
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.

Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: auto - Passed SimStatusTest.
Bug: 66063299

Change-Id: I3aff03ebdc9dc165db66c5007a2fa987ab8cd822
2018-03-28 09:48:53 +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
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
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
Lei Yu
bb90c955df Get anomaly info from StringArrayList
Statsd populates the anomaly info in StringArrayList, not StringArray. So
in settings we should use the correct API to get the data.

Bug: 77141809
Test: RunSettingsRoboTests
Change-Id: I56fc096106b5c040422fd7f5bb8cb4be7fe71d9d
2018-03-27 16:10:54 -07:00
Vishwath Mohan
90e1cfb424 Merge "Disable pattern fading during the setup flow." into pi-dev
am: a6fa9226c9

Change-Id: I6f2546a9c271a4d7127b7101e6ffcf5754253069
2018-03-27 22:51:41 +00:00
Julia Reynolds
1cda00b12b Allow app lists to have a toggle
And make the notifications app list toggle block/unblock
notifications.

Test: make -j RunSettingsRoboTests
Change-Id: I7417b98fb1c66504897df515c4c84afad591764e
Fixes: 74318867
2018-03-27 18:46:02 -04: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
Vishwath Mohan
a6fa9226c9 Merge "Disable pattern fading during the setup flow." into pi-dev 2018-03-27 22:00:06 +00:00
Bill Yi
70d8e8dea2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 97a1f85291  -s ours

Change-Id: Ief3ac341d55051ca2ea71128d64e4e45298a284c
2018-03-27 21:24:30 +00: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
Lei Yu
04d13ee378 Fix tests for time format in settings
Because now we use different time format across the settings app.
We need to update all the tests.

Bug: 76113036
Test: RunSettingsRoboTests
Change-Id: Id4f7d55775adfdeb1aa0ae234f35d515ced4f450
2018-03-27 13:45:25 -07: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
Vishwath Mohan
670c252429 Disable pattern fading during the setup flow.
This CL disables fading the pattern during the pattern setup flow.

Test: The pattern fades everywhere but during the pattern setup flow.
Bug: 72798512
Change-Id: I959270cf39bc35080cce21777f0e168373406a17
2018-03-27 19:47:08 +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
Fan Zhang
cb3b32c9c4 Merge "Add string linter preupload check" into pi-dev
am: 49d0205749

Change-Id: Icaf820d0d6e4f6b9f56283e93752310355e15b89
2018-03-27 16:10:50 +00:00
TreeHugger Robot
49d0205749 Merge "Add string linter preupload check" into pi-dev 2018-03-27 16:01:24 +00:00
Amin Shaikh
2f6979c9fe Merge "Show wifi status label in preference summary." into pi-dev
am: d467a8bc0f

Change-Id: Icae963b4831b916e615a9e729116135967c5a388
2018-03-27 13:24:24 +00: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
TreeHugger Robot
d467a8bc0f Merge "Show wifi status label in preference summary." into pi-dev 2018-03-27 13:10:24 +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
Victor Chang
93e464564f Fix crash in time zone picker due to race condition on view updates
am: 201c629fcc

Change-Id: Icd55bf16959da9e67b75ec93c53ef21fdcb9014f
2018-03-27 09:42:04 +00:00
Victor Chang
201c629fcc Fix crash in time zone picker due to race condition on view updates
- Can't reproduce the race condition with manual test, probably the view
  updates are fast enough that only monkey test can reproduce the issue.
- Reproduced a similar stacktrace and IndexOutOfBoundsException with
  Robolectric test by assuming that the race condition happens after
  text filtering and view updates. Try to fix the bug with this assumption
- The fix is to bind the data (data position in adapter) with ViewHolder.

Bug: 75322108
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ie5d932bce30590b8067e042c3380911c9608872f
2018-03-27 09:31:54 +00:00
yuemingw
8c3bccda2c Merge "Auto time should show dynamic subtext when restricted." into pi-dev
am: d7ea524e81

Change-Id: I161487aff5d83975c6c0e647e8405fab89376f9e
2018-03-27 08:37:28 +00:00
TreeHugger Robot
d7ea524e81 Merge "Auto time should show dynamic subtext when restricted." into pi-dev 2018-03-27 08:30:20 +00:00
Wenhung Teng
00bddd986e Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
am: 032b0454f8

Change-Id: I4676626f12b340752bd867c73d45eda5d0124a1c
2018-03-27 06:26:57 +00:00
Wenhung Teng
032b0454f8 Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev 2018-03-27 06:13:53 +00:00
Adam Newman
211535a10d Merge "Observe NetworkCallback instead of polling" into pi-dev
am: d2fb46eac4

Change-Id: Id06fb42bf1144fa3f04d092718427d484557732f
2018-03-27 05:48:04 +00:00
Adam Newman
d2fb46eac4 Merge "Observe NetworkCallback instead of polling" into pi-dev 2018-03-27 05:23:21 +00:00
Fan Zhang
4b2c171288 Add string linter preupload check
Bug: 76097999
Test: repo upload
Change-Id: Ieb31c931d73a4325f605963b374ca7a2d568e08c
2018-03-26 21:38:34 -07:00
Fan Zhang
b4c4d47e2e Merge "Use custom drawable for Battery saver condition icon." into pi-dev
am: 74ac3b1f3a

Change-Id: I74be965dce1442a532c13590b105e43ec078c87c
2018-03-27 04:34:46 +00:00
Jyun LuoLai
1c502210e3 Merge "Update Bluetooth related string" into pi-dev
am: 198a6495ad

Change-Id: Icb0cdc09c6c0ccb1d359ff4b5e0887cab9f635d9
2018-03-27 04:28:56 +00:00
Fan Zhang
74ac3b1f3a Merge "Use custom drawable for Battery saver condition icon." into pi-dev 2018-03-27 04:25:15 +00:00
Kevin Chyn
674902b537 Merge "Don't show FP error canceled message" into pi-dev
am: 2c6ea60711

Change-Id: I3431a6be839f354ee0dc0e982162c894323271c2
2018-03-27 04:03:30 +00:00
TreeHugger Robot
198a6495ad Merge "Update Bluetooth related string" into pi-dev 2018-03-27 03:53:27 +00:00
TreeHugger Robot
2c6ea60711 Merge "Don't show FP error canceled message" into pi-dev 2018-03-27 03:28:27 +00:00