Jan Nordqvist
976280308d
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
...
am: 00a2dcb8f9
Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
2018-03-28 20:40:15 +00:00
Fan Zhang
ad55f8dd80
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev am: 8482455df7
...
am: f08dd43f2a
Change-Id: I71761c96deae57d260d35a7dfcfa3bad90cdea72
2018-03-28 20:36:56 +00:00
Makoto Onuki
5ed0d7177d
Merge "Fix battery saver setting default state" into pi-dev am: 856017f915
...
am: 4cd5487e11
Change-Id: I65d6cb8508923786606301ed611dd925a9f266b7
2018-03-28 20:30:11 +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
Fan Zhang
f08dd43f2a
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
...
am: 8482455df7
Change-Id: I10b2fc33b345607358ad81c98784eb15fcd2c2e5
2018-03-28 20:07:23 +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
Makoto Onuki
4cd5487e11
Merge "Fix battery saver setting default state" into pi-dev
...
am: 856017f915
Change-Id: I32f20eac01ddeed16ed95c3b8b9323067b8d0608
2018-03-28 20:00:45 +00:00
Treehugger Robot
e8b70d7422
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
2018-03-28 19:51:28 +00:00
TreeHugger Robot
8482455df7
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
2018-03-28 19:41:24 +00:00
Lei Yu
4571dfccfb
Merge "Get anomaly info from StringArrayList" into pi-dev am: 512cb18c2e
...
am: 7952ddd062
Change-Id: I765c9400804d178c854b92d1650bcf7110c6eec7
2018-03-28 19:33:25 +00:00
TreeHugger Robot
856017f915
Merge "Fix battery saver setting default state" into pi-dev
2018-03-28 19:31:51 +00:00
Lei Yu
7952ddd062
Merge "Get anomaly info from StringArrayList" into pi-dev
...
am: 512cb18c2e
Change-Id: If0f76de185b489e5c7ac4ae4d6dfb930ef35e03f
2018-03-28 19:22:12 +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
Victor Chang
4aef470537
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev am: 05ab467e80
...
am: 5aa3b3c3b8
Change-Id: I19213b029819d45b63d7e9584df2e3e83773d367
2018-03-28 18:01:23 +00: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
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