OSDN Git Service
Maurice Lam [Fri, 8 Sep 2017 20:08:03 +0000 (13:08 -0700)]
Add FakeFeatureFactory.setupForTest
In AssisGestureSettingsTest, FakeFeatureFactory was used but was
missing a setupForTest call.
Test: cd tests/robotests && \
ROBOTEST_FILTER=AssistGestureSettingsTest mma
Change-Id: Ie78232d854aee00c7969a3d2dc148354be7de484
Brad Ebinger [Fri, 8 Sep 2017 17:04:24 +0000 (17:04 +0000)]
Merge "Add ims registration status"
Andrew Scull [Fri, 8 Sep 2017 16:01:41 +0000 (16:01 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock."
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
daqi [Fri, 8 Sep 2017 10:23:05 +0000 (10:23 +0000)]
Merge "Fix TrustedCredentialsSettings NPE" am:
c9e532f508 am:
93860b298b am:
21e55623f2
am:
b4204836cf
Change-Id: I7e9a1cb5c57fb58610cb20ba3d1469b752193e9d
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:59:22 +0000 (06:59 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev am:
4ce113d6f8
am:
1fe7838e70
Change-Id: I16c83ce3dbceb5353a197963ea49916515b9819d
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
Ajay Nadathur [Fri, 8 Sep 2017 05:09:21 +0000 (05:09 +0000)]
Merge "Set title in remote views if present in bundle"
Jack He [Thu, 7 Sep 2017 23:54:21 +0000 (23:54 +0000)]
Bluetooth: add metrics for pairing with devices without names am:
5b017f7b05
am:
d9de1ecc03
Change-Id: I34a61269d955ffd9aa073aa1c514c3f3e148adbc
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
TreeHugger Robot [Thu, 7 Sep 2017 19:55:46 +0000 (19:55 +0000)]
Merge "Some code cleanup"
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:51:54 +0000 (17:51 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev am:
6361c9d851
am:
7ee2b191d6
Change-Id: I9a80b2b7e8d6ab83fef2a1886b65c8ddfb2760be
TreeHugger Robot [Thu, 7 Sep 2017 17:51:22 +0000 (17:51 +0000)]
Merge "Separate collection of indexable data from indexing"
Fan Zhang [Thu, 7 Sep 2017 17:48:45 +0000 (10:48 -0700)]
Some code cleanup
- Formatting
- Remove unused code
Test: robotests
Change-Id: If259c7c3893df96744f3c0ad62a378ef6ce01de7
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
Matthew Fritze [Tue, 22 Aug 2017 22:51:50 +0000 (15:51 -0700)]
Separate collection of indexable data from indexing
The first step in refactoring the god class,
DatabaseIndexingManager.
The class has one major entry point: indexDatabase
which begins a chain of calls that first collects all the
data from the fragments, and then massages that data into
the SQLite database. Unfortunately, most of the methods
do not return data, and just pass along some mutated
form of the data until it can be insterted.
Reading and testing this class is very difficult.
This first step moves the collection of the indexable data
into a new class which has a few benefits:
- The data can be easily mocked in tests
- Reduces complexity of D.I.M.
- Separates data collection from indexing, which allows the
indexable data to be piped into a new API that unbundled
search can consume.
Bug:
33577327
Test: make RunSettingsRoboTests
Test: Grabbed a DB dump before change, compared to DB dump after change
to make sure everything is still indexed.
Change-Id: Ibc91e3d75ff5dcf5274b93b29bf3544f90b2194d
Daniel Nishi [Thu, 7 Sep 2017 15:35:03 +0000 (15:35 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev am:
7fae6c67fb
am:
cad295918c
Change-Id: I42136185af82217383526a38c8c3a4ffc2e4829e
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
Alison Cichowlas [Wed, 6 Sep 2017 22:54:54 +0000 (22:54 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev am:
40b8d3d238
am:
22fc09757e
Change-Id: Ifd08b4aff4ef20c37302726aa14eedd93e80958f
Fan Zhang [Wed, 6 Sep 2017 22:54:09 +0000 (22:54 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev am:
bda6500884
am:
08c4871dbe
Change-Id: Ib01d65ae56ac7f03f25ca320724ba6b3cd90b861
Fan Zhang [Wed, 6 Sep 2017 22:53:14 +0000 (22:53 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev am:
dad9b79630
am:
b1ff93dfeb
Change-Id: I9206b968d53c89924076e1f3b9979fd00e68945d
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
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
TreeHugger Robot [Wed, 6 Sep 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Create owner file for development package"
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
TreeHugger Robot [Wed, 6 Sep 2017 19:49:36 +0000 (19:49 +0000)]
Merge "Clean up test strings"
Bill Yi [Wed, 6 Sep 2017 19:19:25 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
14a359a550 -s ours
am:
25012afc7f -s ours
Change-Id: Ic4993853ef8110722cb1217bfdf8f3dc513d4904
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
Bill Yi [Wed, 6 Sep 2017 18:43:28 +0000 (18:43 +0000)]
Import translations. DO NOT MERGE am:
535dd7f066 -s ours am:
363626edcf -s ours
am:
f8f6cb368d -s ours
Change-Id: I8b992a197206c0ae4371b1846d9273645c047062
Julia Reynolds [Wed, 6 Sep 2017 18:42:36 +0000 (18:42 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev am:
12c9d6d65a
am:
fa3fa3483e
Change-Id: I9cab11035c64975b45e1c3d99bd707a07b6c693e
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:32:05 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am:
535dd7f066 -s ours am:
6171c4a5bb -s ours
am:
e93c8d88f5 -s ours
Change-Id: I2181f0f6fb36703590d9820be5c22330d3280d7c
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:24:14 +0000 (18:24 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev am:
0280441397
am:
799c54830b
Change-Id: I50dcaf5dcb2de3385a48e1f079f725ff5d9b082b
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
TreeHugger Robot [Wed, 6 Sep 2017 18:05:42 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE"
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
Fan Zhang [Wed, 6 Sep 2017 17:54:19 +0000 (10:54 -0700)]
Clean up test strings
- Mark everything untranslatable to avoid TC confusion
Change-Id: Iea43b0f5f63253833d91aeaa11b3c463cd170741
Fixes:
65355069
Test: builds
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:55:27 +0000 (16:55 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am:
c3b47925e3
am:
f92f6c24f1
Change-Id: I81d955471c420647b884533cf09656cf7cae28c1
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
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
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
Fan Zhang [Wed, 6 Sep 2017 16:29:21 +0000 (09:29 -0700)]
Create owner file for development package
Bug:
65294119
Test: builds
Change-Id: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Jack He [Wed, 6 Sep 2017 16:33:27 +0000 (16:33 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev am:
ffea17b57f
am:
c97bf8daef
Change-Id: Id631d10c6eda378bb9fa99025ee5ac68c82cb10f
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:12:08 +0000 (16:12 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am:
10adff1163
am:
e7cf5e6221
Change-Id: I356a58cadd3e19e61d9585f08e47c9d4cdcf4318
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
Bill Yi [Wed, 6 Sep 2017 15:15:05 +0000 (08:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: If965ef4d51917904739ed4726b036a285adc6d6d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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 01:56:23 +0000 (01:56 +0000)]
Merge "Settings is crashed high probability when doing follow steps" am:
2584202cb7 am:
8f42d1a4ab am:
e096a55f03
am:
8aeabc23c6
Change-Id: I23eeea1f5f95e8cb9d55e3f59877909574cf5f66
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
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:58:22 +0000 (18:58 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am:
d57edb708f
am:
2faa5e7ac5
Change-Id: I011b521869406bd5db74686bd7c15496a03f54c4
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:58:04 +0000 (03:58 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev am:
3d1f6abd6f
am:
5467aed58d
Change-Id: Ic5218a18aa0ea099a113a4c45737baf6bfc05e3a
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:46:36 +0000 (00:46 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev am:
5fe8e76b36
am:
c905662743
Change-Id: Iea22293c41c88fbd9c0a20e71bcfc3972fba17c0
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:37:21 +0000 (23:37 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev am:
8618b8649f
am:
d3e0d745a8
Change-Id: Ieb84a6732af3eacb9d576ecc9cb685cff38b8e20
Amit Mahajan [Fri, 1 Sep 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev am:
cf11e21d47
am:
f161b63c2a
Change-Id: I10c73c2b94d521860d569d3fb7ef5560dde4393b