OSDN Git Service
Erik Kline [Mon, 11 Sep 2017 05:04:28 +0000 (05:04 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am:
1b62d99433
am:
775807f422
Change-Id: I55fbd611fee9f17215412a76b480cdee96f62b32
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
TreeHugger Robot [Fri, 8 Sep 2017 22:30:05 +0000 (22:30 +0000)]
Merge "Add FakeFeatureFactory.setupForTest"
Fan Zhang [Fri, 8 Sep 2017 22:23:19 +0000 (22:23 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am:
90f9398f4e
am:
ed71e21541
Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16
Daniel Nishi [Fri, 8 Sep 2017 22:22:32 +0000 (22:22 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am:
3315f38c3f
am:
df0e716b43
Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449
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 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
Maurice Lam [Fri, 8 Sep 2017 20:04:19 +0000 (20:04 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev am:
40e284b196
am:
f26fe2763a -s ours
Change-Id: I1ec02f7ae6a26686a173553d72f1b5b3bbc8167a
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
Andrew Scull [Fri, 8 Sep 2017 19:51:09 +0000 (19:51 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev am:
0bac26b6cd
am:
e1f4703dbe
Change-Id: I965bfe2e5a3be1c078c4769d2aaaa07fd92d1b1e
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
Stephen Chen [Fri, 8 Sep 2017 19:04:48 +0000 (19:04 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev am:
194638ac78
am:
d2f9de37c7
Change-Id: Id8725588b14f6a74efbdb2065864f2fce1561873
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
debesay guadad [Fri, 8 Sep 2017 17:44:36 +0000 (17:44 +0000)]
Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
am:
6f48d5e767 -s ours
Change-Id: I625d9a95d02865a6a97685421a00cee145b99de7
debesay guadad [Fri, 8 Sep 2017 17:24:22 +0000 (17:24 +0000)]
Add ims registration status
am:
5b1651b3bb -s ours
Change-Id: Ib49e236b3701eea3269565d515bb6c9e9c265e23
TreeHugger Robot [Fri, 8 Sep 2017 17:14:18 +0000 (17:14 +0000)]
Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
Brad Ebinger [Fri, 8 Sep 2017 17:04:24 +0000 (17:04 +0000)]
Merge "Add ims registration status"
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)
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"
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: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
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
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
OSDN Git Service
