Alison Cichowlas
22fc09757e
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
...
am: 40b8d3d238
Change-Id: Ifb481299638c2bb086270555ef981f0435c34da1
2017-09-06 21:23:52 +00:00
Fan Zhang
08c4871dbe
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
...
am: bda6500884
Change-Id: I119661153a87d0ebe67367c7350c2934679902a3
2017-09-06 21:23:04 +00:00
Fan Zhang
b1ff93dfeb
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
...
am: dad9b79630
Change-Id: I6236900d715e7ef85e2855513c41689a68046a07
2017-09-06 21:22:14 +00:00
TreeHugger Robot
418976552c
Merge "Create owner file for development package"
2017-09-06 21:17:15 +00:00
Alison Cichowlas
40b8d3d238
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
2017-09-06 21:01:35 +00:00
TreeHugger Robot
bda6500884
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
2017-09-06 20:37:15 +00:00
TreeHugger Robot
dad9b79630
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
2017-09-06 19:53:39 +00:00
TreeHugger Robot
7f541b8227
Merge "Clean up test strings"
2017-09-06 19:49:36 +00:00
Bill Yi
ea080fbf34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a359a550
-s ours
...
am: 25012afc7f
-s ours
Change-Id: Ic4993853ef8110722cb1217bfdf8f3dc513d4904
2017-09-06 19:19:25 +00:00
Bill Yi
25012afc7f
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 14a359a550
-s ours
Change-Id: I3a7049ec212e3da3b673d3480ef3be5396762098
2017-09-06 18:56:13 +00:00
Bill Yi
2b037d3e8a
Import translations. DO NOT MERGE am: 535dd7f066
-s ours am: 363626edcf
-s ours
...
am: f8f6cb368d
-s ours
Change-Id: I8b992a197206c0ae4371b1846d9273645c047062
2017-09-06 18:43:28 +00:00
Julia Reynolds
97942ca832
Merge "Properly show/hide advanced settings" into oc-mr1-dev am: 12c9d6d65a
...
am: fa3fa3483e
Change-Id: I9cab11035c64975b45e1c3d99bd707a07b6c693e
2017-09-06 18:42:36 +00:00
TreeHugger Robot
14a359a550
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-06 18:40:23 +00:00
Bill Yi
f8f6cb368d
Import translations. DO NOT MERGE am: 535dd7f066
-s ours
...
am: 363626edcf
-s ours
Change-Id: I7db2955fe4f48c1867d16513682a1a985eed01f1
2017-09-06 18:40:07 +00:00
Julia Reynolds
fa3fa3483e
Merge "Properly show/hide advanced settings" into oc-mr1-dev
...
am: 12c9d6d65a
Change-Id: Id5e2a6291b630114fc4952ed49fcd57929205461
2017-09-06 18:39:24 +00:00
Bill Yi
5aba524e60
Import translations. DO NOT MERGE am: 535dd7f066
-s ours am: 6171c4a5bb
-s ours
...
am: e93c8d88f5
-s ours
Change-Id: I2181f0f6fb36703590d9820be5c22330d3280d7c
2017-09-06 18:32:05 +00:00
Bill Yi
e93c8d88f5
Import translations. DO NOT MERGE am: 535dd7f066
-s ours
...
am: 6171c4a5bb
-s ours
Change-Id: Iccd2d99cf8f2c096253dafe6c42f712cf0ee6292
2017-09-06 18:29:32 +00:00
Bill Yi
363626edcf
Import translations. DO NOT MERGE
...
am: 535dd7f066
-s ours
Change-Id: I49d4fe2d5608a2d050390d6e53a770c4dec11cff
2017-09-06 18:27:10 +00:00
Bill Yi
6171c4a5bb
Import translations. DO NOT MERGE
...
am: 535dd7f066
-s ours
Change-Id: Ib159ba464000cbfc9304a5d246f717d1ce35bcc2
2017-09-06 18:27:05 +00:00
TreeHugger Robot
12c9d6d65a
Merge "Properly show/hide advanced settings" into oc-mr1-dev
2017-09-06 18:26:13 +00:00
Tony Mak
c04c1baf2e
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev am: 0280441397
...
am: 799c54830b
Change-Id: I50dcaf5dcb2de3385a48e1f079f725ff5d9b082b
2017-09-06 18:24:14 +00:00
Tony Mak
799c54830b
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
...
am: 0280441397
Change-Id: Ibe78c546ae2d510c7f33862b700b9873e554743c
2017-09-06 18:12:05 +00:00
TreeHugger Robot
a43af4a43c
Merge "Import translations. DO NOT MERGE"
2017-09-06 18:05:42 +00:00
Fan Zhang
31d8a89220
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
2017-09-06 10:58:52 -07:00
TreeHugger Robot
0280441397
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
2017-09-06 17:57:09 +00:00
Fan Zhang
a0372028f0
Clean up test strings
...
- Mark everything untranslatable to avoid TC confusion
Change-Id: Iea43b0f5f63253833d91aeaa11b3c463cd170741
Fixes: 65355069
Test: builds
2017-09-06 10:54:19 -07:00
Daniel Nishi
9e6d39e71a
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
2017-09-06 10:11:48 -07:00
Antony Sargent
cbb0bcfeae
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am: c3b47925e3
...
am: f92f6c24f1
Change-Id: I81d955471c420647b884533cf09656cf7cae28c1
2017-09-06 16:55:27 +00:00
Antony Sargent
f92f6c24f1
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
...
am: c3b47925e3
Change-Id: I7c9a07543340992e8bd3ff15538d74d28a1aab22
2017-09-06 16:53:28 +00:00
Antony Sargent
c3b47925e3
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
2017-09-06 16:42:41 +00:00
debesay guadad
b7a11feaa2
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
2017-09-06 16:40:19 +00:00
Fan Zhang
aabf364e0e
Create owner file for development package
...
Bug: 65294119
Test: builds
Change-Id: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
2017-09-06 16:35:16 +00:00
Jack He
81266c97ed
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev am: ffea17b57f
...
am: c97bf8daef
Change-Id: Id631d10c6eda378bb9fa99025ee5ac68c82cb10f
2017-09-06 16:33:27 +00:00
Jack He
c97bf8daef
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
...
am: ffea17b57f
Change-Id: I4295f1c186863d157520d93abfe0cbaf3c354247
2017-09-06 16:31:27 +00:00
TreeHugger Robot
ffea17b57f
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
2017-09-06 16:25:28 +00:00
Charles He
0a72c23393
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
...
am: e7cf5e6221
Change-Id: I356a58cadd3e19e61d9585f08e47c9d4cdcf4318
2017-09-06 16:12:08 +00:00
Charles He
e7cf5e6221
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
...
am: 10adff1163
Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d
2017-09-06 16:06:32 +00:00
Charles He
10adff1163
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
2017-09-06 15:59:16 +00:00
Charles He
289af93896
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
2017-09-06 15:58:14 +00:00
Bill Yi
535dd7f066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
2017-09-06 08:36:23 -07:00
Bill Yi
c5aa59ac2d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ie01e378113e1d71c095e3a750b668d59bf3e4c46
2017-09-06 08:31:10 -07:00
Bill Yi
ef8151c8b3
Import translations. DO NOT MERGE
...
Change-Id: If965ef4d51917904739ed4726b036a285adc6d6d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-06 08:15:05 -07:00
Julia Reynolds
bd42fe5880
Properly show/hide advanced settings
...
Change-Id: I31f6f877f1945187a6f19e1b383bd3755656fb9b
Fixes: 65375390
Test: manual
2017-09-06 10:36:22 -04:00
Tony Mak
ee36bb98a1
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
2017-09-06 10:34:21 +00:00
edgar.huang
d2a65d5f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
am: 8f42d1a4ab
am: e096a55f03
...
am: 8aeabc23c6
Change-Id: I23eeea1f5f95e8cb9d55e3f59877909574cf5f66
2017-09-06 01:56:23 +00:00
edgar.huang
8aeabc23c6
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
am: 8f42d1a4ab
...
am: e096a55f03
Change-Id: Id5ace14f946ac9cab23bcafb053e5087ae6a38a1
2017-09-06 00:44:05 +00:00
edgar.huang
e096a55f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
...
am: 8f42d1a4ab
Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
2017-09-06 00:21:17 +00:00
Treehugger Robot
2584202cb7
Merge "Settings is crashed high probability when doing follow steps"
2017-09-06 00:12:44 +00:00
Jack He
c9d7e8767b
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
2017-09-05 15:44:48 -07:00