OSDN Git Service
Maurice Lam [Mon, 11 Sep 2017 20:09:55 +0000 (20:09 +0000)]
Merge "Fix sizing of pattern view" into oc-mr1-dev
am:
adef5b23e0
Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
Antony Sargent [Mon, 11 Sep 2017 20:09:25 +0000 (20:09 +0000)]
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
am:
b8ff97fbd5
Change-Id: I559aa49ff0ef4aa82a6a1fb989d05c81ac7575fe
Maurice Lam [Mon, 11 Sep 2017 20:07:48 +0000 (20:07 +0000)]
Merge "Fix sizing of pattern view" into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Fix sizing of pattern view
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)
Test: Manual
Bug:
64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
TreeHugger Robot [Mon, 11 Sep 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
Amit Mahajan [Mon, 11 Sep 2017 18:01:35 +0000 (18:01 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." am:
c2c0edff09 am:
6ca28e8362
am:
154779b6af
Change-Id: I90715e84699ac52ce727782917c7a0c75a40e843
jackqdyulei [Mon, 11 Sep 2017 17:53:43 +0000 (17:53 +0000)]
Merge "Make system item has a consistent name." into oc-mr1-dev
am:
9a3cb9b835
Change-Id: I928f4266130d488476aadd6dd61a3ce22c579aa2
Amit Mahajan [Mon, 11 Sep 2017 17:51:18 +0000 (17:51 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." am:
c2c0edff09
am:
6ca28e8362
Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
Amit Mahajan [Mon, 11 Sep 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
am:
c2c0edff09
Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
TreeHugger Robot [Mon, 11 Sep 2017 17:33:09 +0000 (17:33 +0000)]
Merge "Make system item has a consistent name." into oc-mr1-dev
Treehugger Robot [Mon, 11 Sep 2017 17:21:07 +0000 (17:21 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed."
Antony Sargent [Thu, 7 Sep 2017 23:19:17 +0000 (16:19 -0700)]
Fix focus behavior of ValidatedEditTextPreference
The bug report was that the cursor is set to the beginning of the
EditText for wifi hotspot password field, instead of at the end (or
having the entire field selected). This fix makes it so that all
ValidatedEditTextPreference's will put the cursor at the end of the
EditText.
Bug:
65413206
Test: make RunSettingsRoboTests
Change-Id: I23f3bb1b3f1b49b2f193c0ae2e103eae5c1a1019
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
Erik Kline [Mon, 11 Sep 2017 05:00:34 +0000 (05:00 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
am:
1b62d99433
Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
TreeHugger Robot [Mon, 11 Sep 2017 04:56:28 +0000 (04:56 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
Include IPv6 DNS servers in wifi details
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug:
65037256
Bug:
65467586
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
Fan Zhang [Fri, 8 Sep 2017 22:04:52 +0000 (22:04 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
am:
90f9398f4e
Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
Daniel Nishi [Fri, 8 Sep 2017 22:04:12 +0000 (22:04 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
am:
3315f38c3f
Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
TreeHugger Robot [Fri, 8 Sep 2017 21:42:32 +0000 (21:42 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
Daniel Nishi [Fri, 8 Sep 2017 21:39:16 +0000 (21:39 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am:
40e284b196
Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad
Maurice Lam [Fri, 8 Sep 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
Andrew Scull [Fri, 8 Sep 2017 19:33:34 +0000 (19:33 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
am:
0bac26b6cd
Change-Id: I30996559ac5166d4ed2cf59688239effe335a305
TreeHugger Robot [Fri, 8 Sep 2017 19:08:48 +0000 (19:08 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
Maurice Lam [Thu, 7 Sep 2017 03:52:22 +0000 (20:52 -0700)]
Don't default to PIN on non FBE devices. DO NOT MERGE
So that EncryptionInterstitial is shown as part of the flow
Test: cd tests/robotests && mma
Bug:
65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
Stephen Chen [Fri, 8 Sep 2017 18:55:58 +0000 (18:55 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
am:
194638ac78
Change-Id: I6dc3ce13040a0b20b5197c5cfac6bc55b09ab679
TreeHugger Robot [Fri, 8 Sep 2017 18:47:08 +0000 (18:47 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
TreeHugger Robot [Fri, 8 Sep 2017 17:14:18 +0000 (17:14 +0000)]
Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
Daniel Nishi [Fri, 1 Sep 2017 22:58:30 +0000 (15:58 -0700)]
Re-add the block of text explaining the feature.
When the automatic storage manager is off (or has never been run), we
display a block of text that explains what it does. In order to make
this testable, I've implemented the feature in a PreferenceController
and upgraded the existing AutomaticStorageManagerSettings class to be
closer to the newer Settings IA.
Change-Id: I3f7d20347a6d5a7bae8bffcd2014c3fdcd315b90
Fixes:
63082545
Test: Settings Robotest
Andrew Scull [Wed, 6 Sep 2017 16:53:25 +0000 (17:53 +0100)]
Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.
DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.
Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug:
65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
(cherry picked from commit
0aa45bed65f544e68e0d38f255da005b3ce9fddf)
daqi [Fri, 8 Sep 2017 10:16:34 +0000 (10:16 +0000)]
Merge "Fix TrustedCredentialsSettings NPE" am:
c9e532f508 am:
93860b298b
am:
21e55623f2
Change-Id: I38f6f53ffd70f8b1ac67ea3695d2b9d5d4b76509
daqi [Fri, 8 Sep 2017 10:10:16 +0000 (10:10 +0000)]
Merge "Fix TrustedCredentialsSettings NPE" am:
c9e532f508
am:
93860b298b
Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
daqi [Fri, 8 Sep 2017 10:04:17 +0000 (10:04 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
am:
c9e532f508
Change-Id: I2ce8ea95abbbd1d522be4897069d4515354d3b14
Treehugger Robot [Fri, 8 Sep 2017 09:56:31 +0000 (09:56 +0000)]
Merge "Fix TrustedCredentialsSettings NPE"
Ajay Nadathur [Fri, 8 Sep 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
am:
4ce113d6f8
Change-Id: Iaa650a18bd4efb74e6b903efad0ad1a02865429c
TreeHugger Robot [Fri, 8 Sep 2017 06:36:46 +0000 (06:36 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
Fan Zhang [Thu, 7 Sep 2017 23:06:24 +0000 (16:06 -0700)]
Don't attempt to tint icon if icon is not available
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes:
65460834
Test: robotests
Jack He [Thu, 7 Sep 2017 23:25:43 +0000 (23:25 +0000)]
Bluetooth: add metrics for pairing with devices without names
am:
5b017f7b05
Change-Id: If74bd132ee1352888a7f9513444e998537f11145
debesay guadad [Fri, 26 Feb 2016 06:49:27 +0000 (14:49 +0800)]
Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.
Test: manual Checked "IMS registration state" in Status menu
Bug:
28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
Jack He [Thu, 31 Aug 2017 02:18:40 +0000 (19:18 -0700)]
Bluetooth: add metrics for pairing with devices without names
* Also caches context in onClick() method
Bug:
34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
Daniel Nishi [Thu, 7 Sep 2017 17:44:00 +0000 (17:44 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev
am:
6361c9d851
Change-Id: If1df9295530334cf58ffec9577b625fedad7ad4e
Daniel Nishi [Thu, 7 Sep 2017 15:15:16 +0000 (15:15 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
am:
7fae6c67fb
Change-Id: I5e29852872dd08e0e5bb3f1822127879dc354319
Ajay Nadathur [Thu, 31 Aug 2017 18:37:32 +0000 (11:37 -0700)]
Set title in remote views if present in bundle
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call
bug:
62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
daqi [Tue, 5 Sep 2017 01:53:05 +0000 (09:53 +0800)]
Fix TrustedCredentialsSettings NPE
[Cause of Defect]
TrustedCredentialsSettings#mKeyChainConnectionByProfileId is get/set by
more than one thread. Main thread would set it in onDestroy method, and
AsyncTask would get and set in the doInBackground method. So
mKeyChainConnectionByProfileId.get(profileId) would get null after
onDestroy method get called.
Bug: N/A
Test: Debugger to simulate concurrency
Change-Id: I0664d1e9b88b079855354ce0e6fe014a98a22327
Signed-off-by: daqi <daqi@xiaomi.com>
TreeHugger Robot [Wed, 6 Sep 2017 23:20:40 +0000 (23:20 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev
Daniel Nishi [Wed, 6 Sep 2017 23:07:14 +0000 (23:07 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
jackqdyulei [Wed, 6 Sep 2017 21:18:29 +0000 (14:18 -0700)]
Make system item has a consistent name.
In battery settings, the system item contains many packages. In old
behaviour it will use the first package(which has legal name and icon)
to represent this item. This behaviour is not consistent.
In this cl, we always use package "android" to extract name and icon
if it is system item.
Bug:
65090883
Test: RunSettingsRoboTests
Change-Id: Ibb7f85c06ab1745867f1eaa666cea32c8d3295a6
Alison Cichowlas [Wed, 6 Sep 2017 21:23:52 +0000 (21:23 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
am:
40b8d3d238
Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1
Fan Zhang [Wed, 6 Sep 2017 21:23:04 +0000 (21:23 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
am:
bda6500884
Change-Id: I119661153a87d0ebe67367c7350c2934679902a3
Fan Zhang [Wed, 6 Sep 2017 21:22:14 +0000 (21:22 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
am:
dad9b79630
Change-Id: I6236900d715e7ef85e2855513c41689a68046a07
Alison Cichowlas [Wed, 6 Sep 2017 21:01:35 +0000 (21:01 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 19:53:39 +0000 (19:53 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 18:56:13 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
14a359a550 -s ours
Change-Id: I3a7049ec212e3da3b673d3480ef3be5396762098
TreeHugger Robot [Wed, 6 Sep 2017 18:40:23 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 18:40:07 +0000 (18:40 +0000)]
Import translations. DO NOT MERGE am:
535dd7f066 -s ours
am:
363626edcf -s ours
Change-Id: I7db2955fe4f48c1867d16513682a1a985eed01f1
Julia Reynolds [Wed, 6 Sep 2017 18:39:24 +0000 (18:39 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev
am:
12c9d6d65a
Change-Id: Id5e2a6291b630114fc4952ed49fcd57929205461
Bill Yi [Wed, 6 Sep 2017 18:29:32 +0000 (18:29 +0000)]
Import translations. DO NOT MERGE am:
535dd7f066 -s ours
am:
6171c4a5bb -s ours
Change-Id: Iccd2d99cf8f2c096253dafe6c42f712cf0ee6292
Bill Yi [Wed, 6 Sep 2017 18:27:10 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am:
535dd7f066 -s ours
Change-Id: I49d4fe2d5608a2d050390d6e53a770c4dec11cff
Bill Yi [Wed, 6 Sep 2017 18:27:05 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am:
535dd7f066 -s ours
Change-Id: Ib159ba464000cbfc9304a5d246f717d1ce35bcc2
TreeHugger Robot [Wed, 6 Sep 2017 18:26:13 +0000 (18:26 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev
Tony Mak [Wed, 6 Sep 2017 18:12:05 +0000 (18:12 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
am:
0280441397
Change-Id: Ibe78c546ae2d510c7f33862b700b9873e554743c
Fan Zhang [Wed, 6 Sep 2017 17:17:43 +0000 (10:17 -0700)]
Misc polishing fixes for Settings
- Never return null when querying userDictionaryLocales
- Auto mirror mobile setting icon in RTL to match status bar.
Fixes:
65298627
Fixes:
65361092
Test: robotests
Change-Id: I0f9827f7bc23baf4895712c0f86584aeccfb9c73
TreeHugger Robot [Wed, 6 Sep 2017 17:57:09 +0000 (17:57 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 19:45:56 +0000 (12:45 -0700)]
Turn in the work profile's badge.
The badge is no longer part of the preferred work profile UX. By
removing the code which badges the preferences for the individual
storage items, we can avoid placing the no longer needed tiny badges.
Change-Id: I6fd2ec28d3cf55e3a95b877f4c7b9b51c94e12d8
Fixes:
64475406
Test: Manual
Antony Sargent [Wed, 6 Sep 2017 16:53:28 +0000 (16:53 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
am:
c3b47925e3
Change-Id: I7c9a07543340992e8bd3ff15538d74d28a1aab22
Antony Sargent [Wed, 6 Sep 2017 16:42:41 +0000 (16:42 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
Jack He [Wed, 6 Sep 2017 16:31:27 +0000 (16:31 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
am:
ffea17b57f
Change-Id: I4295f1c186863d157520d93abfe0cbaf3c354247
TreeHugger Robot [Wed, 6 Sep 2017 16:25:28 +0000 (16:25 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
Charles He [Wed, 6 Sep 2017 16:06:32 +0000 (16:06 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
am:
10adff1163
Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d
Charles He [Wed, 6 Sep 2017 15:59:16 +0000 (15:59 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
Charles He [Sat, 2 Sep 2017 17:45:18 +0000 (18:45 +0100)]
Enforce wifi config lockdown on details page.
Fixes the bug that, on the new WifiDetailPreference page, the "Forget"
button is not disabled properly for wifi configs created and protected
by DevicePolicyManger.
Robolectric test to follow in a separate CL.
Test: manual, by locking down wifi config with TestDPC
Test: make RunSettingsRoboTests
Bug:
64971700
Bug:
65396674
Change-Id: I27740eabd5eb94415e4258c9c80f91df2d9ab476
Bill Yi [Wed, 6 Sep 2017 15:36:23 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
Bill Yi [Wed, 6 Sep 2017 15:31:10 +0000 (08:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie01e378113e1d71c095e3a750b668d59bf3e4c46
Julia Reynolds [Wed, 6 Sep 2017 13:09:30 +0000 (09:09 -0400)]
Properly show/hide advanced settings
Change-Id: I31f6f877f1945187a6f19e1b383bd3755656fb9b
Fixes:
65375390
Test: manual
Tony Mak [Tue, 5 Sep 2017 15:41:05 +0000 (16:41 +0100)]
Fix policy transparency is missing in remove work profile button
The policy transparency code is not triggered as the button is disabled.
BUG:
64570769
Test: 1. Remove work profile without restriction.
Test: 2. Remove work profile with restriction. Observed a dialog explains
why it is disabled.
Test: 3. Verify setting new admin, uninstall and deactivate button are
working
Change-Id: I1fc9c996785c67daf41a5d31e732d9d82eb56b17
edgar.huang [Wed, 6 Sep 2017 00:44:05 +0000 (00:44 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am:
2584202cb7 am:
8f42d1a4ab
am:
e096a55f03
Change-Id: Id5ace14f946ac9cab23bcafb053e5087ae6a38a1
edgar.huang [Wed, 6 Sep 2017 00:30:44 +0000 (00:30 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am:
2584202cb7
am:
8f42d1a4ab
Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
edgar.huang [Wed, 6 Sep 2017 00:21:17 +0000 (00:21 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
am:
2584202cb7
Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
Treehugger Robot [Wed, 6 Sep 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Settings is crashed high probability when doing follow steps"
Jack He [Tue, 5 Sep 2017 22:44:48 +0000 (15:44 -0700)]
Bluetooth: In-band ringtone setting should be reset to true
* Enable in-band ringing setting should be reset to true when toggling
developer options switch
Bug:
65382863
Test: make, try toggling "Enable in-band ringing" preference
Change-Id: Ic3221710983d5c493fa3dff36bc24611948fc4c1
Daniel Nishi [Thu, 10 Aug 2017 21:09:19 +0000 (14:09 -0700)]
Cache storage values for fast loading.
If the user moves away from the storage fragment and returns, this
allows us to use cached data from the previous calculation. If the data
is > 1 minute old, we consider it stale. Otherwise, we can bypass the
loading screen.
Fixes:
37923463
Test: Settings Robotest
Change-Id: I7650d4d742852f8d447878c077b9190bc0a0bb22
Fan Zhang [Tue, 5 Sep 2017 20:32:24 +0000 (13:32 -0700)]
Pre-set initial state to wifi tether switches.
The preset initial state helps eliminating animation jank when first
landing on the page.
Change-Id: Ia7ba83983f18409b1c653cc1ebb0f3aad281358c
Fixes:
64811322
Test: robotests
Stephen Chen [Fri, 1 Sep 2017 18:18:36 +0000 (11:18 -0700)]
Make auto Wi-Fi summary text consistent with feature availability.
"Turn Wi-Fi on automatically" feature is disabled when airplane mode or
battery saver mode is enabled, when Wi-Fi scanning is disabled, or when
network recommendations are disabled / scorer unset. This change
captures these negative cases in the summary text.
Bug:
65085700
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I2f2d22b5bef3ad03a28d34e79a27e6545cac557f
Alison Cichowlas [Tue, 5 Sep 2017 18:57:33 +0000 (14:57 -0400)]
Reorder "on the lock screen" options.
Fixes:
62872287
Change-Id: I7b2755e7a33fa1a31cebd18d93d268d330d87794
Test: RunSettingsRoboTests, manual
Adrian Roos [Tue, 5 Sep 2017 18:55:47 +0000 (18:55 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
am:
d57edb708f
Change-Id: I385acf93d60bfbc98f39aa0178018e3976a39974
TreeHugger Robot [Tue, 5 Sep 2017 18:43:30 +0000 (18:43 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
Antony Sargent [Tue, 29 Aug 2017 16:30:52 +0000 (09:30 -0700)]
Fix Bluetooth switch status in Connected devices screen
The symptom observed is that the Bluetooth master switch on the
Connected devices page doesn't properly respond to Bluetooth turning off
via quicksettings - either turning on airplane mode or just toggling
Bluetooth.
The root cause was that MasterSwitchPreference's isChecked method would
not return the true value of whether the switch was checked - if the
control is disabled, it always just returns false. This interacts badly
with code in BluetoothEnabler - we disable the switch when the Bluetooth
state is in transition (eg becomes STATE_TURNING_OFF), and we also
attempt to avoid calling setChecked if the switch is already in the
desired state. So the switch would be checked but disabled, and we'd
avoid ever calling setChecked(false) on it.
A thorough fix would be to remove the code from MasterSwitchPreference's
isChecked method that looks at the enabled state, since enabled and
checked really should be treated as separate concerns. But given the
timeframe of MR1, we're opting for a more conservative fix of directly
accessing the switch and checking it's state, to avoid introducing bugs
in other consumers that might be depending on the current
behavior. We'll then do the thorough fix on the master branch which will
give a lot more time for any unexpected issues to be found (I audited
other usages and none seemed likely to be a problem, but it's better to
be safe than sorry).
Change-Id: I19a6c6b71e74595be3ef32a9718a430b67a89d53
Bug:
64940731
Test: make RunSettingsRoboTests
Adrian Roos [Tue, 5 Sep 2017 10:37:38 +0000 (12:37 +0200)]
FRP: Use SUW theme for factory reset protection flow
Bug:
37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
edgar.huang [Thu, 31 Aug 2017 03:22:25 +0000 (11:22 +0800)]
Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
Daniel Nishi [Sat, 2 Sep 2017 03:39:51 +0000 (03:39 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
am:
3d1f6abd6f
Change-Id: Ic944357091b2cd16115fd4b0f3ff0459090a3e27
TreeHugger Robot [Sat, 2 Sep 2017 03:29:52 +0000 (03:29 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
Daniel Nishi [Wed, 23 Aug 2017 17:28:36 +0000 (10:28 -0700)]
Make photos/videos storage preference normal.
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.
Fixes:
64147318
Test: Settings robotests
Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
Doris Ling [Sat, 2 Sep 2017 00:41:28 +0000 (00:41 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
am:
5fe8e76b36
Change-Id: I02625057fd4636f8ce61d5772f7ce4083fb7f81f
TreeHugger Robot [Sat, 2 Sep 2017 00:17:08 +0000 (00:17 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
am:
8618b8649f
Change-Id: I8757ff64193dc0754b01aa769e55a355464e2d01
Amit Mahajan [Fri, 1 Sep 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
am:
cf11e21d47
Change-Id: Ica848195898e8d88e3882091c2a06ff4e79e55ca
Daniel Nishi [Fri, 1 Sep 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
Amit Mahajan [Fri, 1 Sep 2017 22:42:09 +0000 (22:42 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
Doris Ling [Thu, 24 Aug 2017 22:24:33 +0000 (15:24 -0700)]
Set drawable for the entity header app preference button.
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.
Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes:
64826061
Test: make RunSettingsRoboTests