Commit Graph

44381 Commits

Author SHA1 Message Date
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
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
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
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
Bill Yi
8d5c12f213 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4fa5774b90 -s ours
am: 24346f619e  -s ours

Change-Id: Ie7f27d978c484c90545a22b812e569b72499a066
2018-03-28 17:44:00 +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
Bill Yi
24346f619e [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 4fa5774b90  -s ours

Change-Id: I982cb88d891696dd14f36f9a4c908464746db66e
2018-03-28 17:28: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
Lei Yu
081bbac10d Merge "Fix tests for time format in settings" into pi-dev am: d46cf49b6d
am: a79ba59c3d

Change-Id: Ia74eca1bde10dfde1c5d462d7acfecd2af733b18
2018-03-28 17:06:22 +00:00
Shawn Ding
4d30b81e99 Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev am: bbb3d3e72c
am: 3711215808

Change-Id: I8ba0193d6b91ed5be8d90939d808f7d464b39c7c
2018-03-28 16:59:00 +00:00
Lei Yu
a79ba59c3d Merge "Fix tests for time format in settings" into pi-dev
am: d46cf49b6d

Change-Id: I40a23a9ac45e1bbcdae2ba51a2a1085469e19a76
2018-03-28 16:52:39 +00:00
Shawn Ding
3711215808 Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev
am: bbb3d3e72c

Change-Id: I515e7d7db8d4d365992b41df2306fa235169dea9
2018-03-28 16:47:24 +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
c8eb764d07 Merge "Fix robotest failure" into pi-dev am: aad168729f
am: dbe1ff67e7

Change-Id: I08b1116d00d5d499865808c0156fa05a78adee0e
2018-03-28 15:45:57 +00:00
Fan Zhang
dbe1ff67e7 Merge "Fix robotest failure" into pi-dev
am: aad168729f

Change-Id: I2a013a921d3c818eefa3ef0732afc66755304cd5
2018-03-28 15:28:18 +00:00
Artem Iglikov
c2f76dbac9 Ignore broken test to unblock TreeHugger am: 54f467f9ad
am: 471a5931bd

Change-Id: I1b894bc3e6f9afd01349eb88bd0a84b5efb0613b
2018-03-28 15:17:35 +00:00
Artem Iglikov
471a5931bd Ignore broken test to unblock TreeHugger
am: 54f467f9ad

Change-Id: Icdc40c6ffa9624fa7ba28c3bfe0e70812066b150
2018-03-28 15:12:40 +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
75279510fd Merge "Allow app lists to have a toggle" into pi-dev am: 2c18bbbd75
am: 4fcb862c95

Change-Id: I78a16fd951866a1d8295ce9641c8aa9078f62d67
2018-03-28 11:35:38 +00: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
James.cf Lin
478c669566 Fix the first link is not visible in the supported links
The padding property of ListView covered the first tiem.

Fixes: 67878448
Test: manual test
Change-Id: Ic60d625964cf666f70fd935bb7163018614023c3
2018-03-28 10:57:30 +08:00
Fan Zhang
6cd360a9b1 Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev am: 0a5367c0c4
am: 543bd80a90

Change-Id: Ia404aa2faf697ffc42e29d55600d75f680598508
2018-03-28 02:43:01 +00: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
Vishwath Mohan
bde697bcf6 Merge "Disable pattern fading during the setup flow." into pi-dev am: a6fa9226c9
am: 90e1cfb424

Change-Id: I2afc785e842e29c231b6533e11e92f6e03a3bfd5
2018-03-28 01:18:30 +00: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
e9bec656ef [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97a1f85291 -s ours
am: 70d8e8dea2  -s ours

Change-Id: I7d72846456183dedbd9a7b8fa2953c9c6b9ed31f
2018-03-27 23:48:44 +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
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
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