Beth Thibodeau
3562a41a42
Merge "Adding strings for themepicker suggestion" into qt-dev
2019-05-02 12:29:15 +00:00
Jason Chiu
1789d9ee6a
Update strings for Vibration
...
Fixes: 131345468
Test: visual
Change-Id: I7670ba96cf9b66e241a0003800a30c00f2585fc9
2019-05-02 18:28:42 +08:00
TreeHugger Robot
ccfd708b87
Merge "Clean Safetyhub feature flag from Settings." into qt-dev
2019-05-02 08:44:39 +00:00
pastychang
de6ab19391
Update sub-text in skip lock screen dialog
...
Bug: 131634814
Test: Manual
Change-Id: Iaae7c6c6616bfb8448539e5e18dda68a4754d9be
2019-05-02 16:19:44 +08:00
Raff Tsai
8f205a66c0
Can't switch navigation mode from search results
...
3 Navigation modes are mutually exclusive, we can't set all often
them on. Therefore we will now show them as slices.
Fixes: 131713601
Test: robolectric, manual
Change-Id: I52e94dffe15ed20a23a5e4cea68a40b66158b3dd
2019-05-02 14:40:43 +08:00
timpeng
df2ab2663e
[Fix] prevent Talkback from reading out Bluetooth ImageView ContentDescription
...
am: 0dde3a3b34
Change-Id: I4192c889d3d91a7ccc6e2dbad26aafd4e615bcea
2019-05-01 23:23:49 -07:00
lindatseng
edf63c2d66
Merge "Update Settings owners" into qt-dev
...
am: 0ea58e740d
Change-Id: I047f02e5bac82ea4806bceae8b7285f88e16f0c1
2019-05-01 23:19:14 -07:00
Lei Yu
cd6415d73d
Merge "Update padding for panel" into qt-dev
...
am: 9a4fa9bf0d
Change-Id: Id77f2c8bebb369983358e49c4969efa9e1e54116
2019-05-01 23:09:19 -07:00
lindatseng
f51d1d234c
Merge "Avoid NPE in app storage page" into qt-dev
...
am: 35efae7822
Change-Id: I09ab48b5d849e8c6c34551b1a8fabbe5530015b6
2019-05-01 22:49:08 -07:00
yuanjiahsu
1da7fbb09d
Clean Safetyhub feature flag from Settings.
...
Clean all related code, need submit together.
Test: Manually
Bug: 118848485
Change-Id: Icaa0c0736dfa4a7d96aba396a884c9d3383a0f22
2019-05-02 12:45:53 +08:00
Michael Wachenschwanz
35eef604a3
Simplify user flow for setting default supervisor as PO
...
A follow up CL will clean up and separate the DeviceAdminAdd and
ProfileOwnerAdd logic (see b/131713071)
Bug: 124066840
Test: manual (overlay config_defaultSupervisionProfileOwnerComponent and
confirm only that component can be set as profile owner after setup is
complete)
Test: manual (install CtsVerifier, adb shell am start -n "com.android.cts.verifier/.admin.tapjacking.OverlayingActivity", user should not be able to click the "Allow" button)
Change-Id: Iccd931801145719110ce75421c35db80ea651779
2019-05-02 03:42:06 +00:00
timpeng
0dde3a3b34
[Fix] prevent Talkback from reading out Bluetooth ImageView ContentDescription
...
- set View.IMPORTANT_FOR_ACCESSIBILITY_NO to ImageView
Bug: 128396030
Test: RunSettingsRoboTests
Change-Id: I267921057ede734a3c9be7087f34c96631e04859
2019-05-02 02:05:00 +00:00
Yi-Ling Chuang
0789b5d226
Use PermissionControllerManager to get permission groups
...
The mapping of permissions and permission groups may be changed upon
mainline module update, so we cannot reliably read from the platform.
PermissionControllerManager is created for this purpose, so we use it
to prevent from the outdated mapping instead of mapping them manually.
Bug: 117978938
Test: robotests
Change-Id: If8682796b8a30dee3b73572e977fade48d07eb2b
2019-05-02 10:04:53 +08:00
cosmohsieh
95176da5d2
[PasspointV2] Fix lint error
...
Lint error ... "Missing mandatory plural message forms: =1."
Add case one for plural string to prevent lint error, even though
this case should not happened.
Bug: 131688045
Test: manual
Change-Id: I1087b26495c71a6d167d7eaee1359d39c81cc59f
2019-05-02 09:51:42 +08:00
TreeHugger Robot
0ea58e740d
Merge "Update Settings owners" into qt-dev
2019-05-02 01:44:49 +00:00
lindatseng
5eaa4a84bd
Update Settings owners
...
Test: rebuild
Fixes: 131782410
Change-Id: I9f2b399efcd6b784325fcef66bde45a01417e5e8
2019-05-02 01:44:42 +00:00
Xiangyu/Malcolm Chen
ac800b27b2
[automerger skipped] Merge "Adding new strings needed for Enable MMS toggle." am: 3c6cb98ec0
...
am: bb95bb5f8b
-s ours
am skip reason: change_id If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c with SHA1 3b5a28e2e9
is in history
Change-Id: I46da2ddc9e596575d5d7a012c9dab50fa3ee8cb1
2019-05-01 16:32:34 -07:00
Lei Yu
9a4fa9bf0d
Merge "Update padding for panel" into qt-dev
2019-05-01 22:06:58 +00:00
Xiangyu/Malcolm Chen
bb95bb5f8b
Merge "Adding new strings needed for Enable MMS toggle."
...
am: 3c6cb98ec0
Change-Id: I4c011e272fe7610b2751f5f49c0132ee497ff280
2019-05-01 14:58:44 -07:00
Julia Reynolds
176f142f74
Merge "Importance preference updates" into qt-dev
...
am: 1613d883e8
Change-Id: I4b1d004cf4ff88253a901942b70b312d8751d033
2019-05-01 13:55:20 -07:00
Xiangyu/Malcolm Chen
3c6cb98ec0
Merge "Adding new strings needed for Enable MMS toggle."
2019-05-01 20:49:35 +00:00
TreeHugger Robot
35efae7822
Merge "Avoid NPE in app storage page" into qt-dev
2019-05-01 20:19:42 +00:00
Beth Thibodeau
fe488a9ea4
Adding strings for themepicker suggestion
...
Bug: 126230901
Test: mp settingsg
Change-Id: I2c94c455fedb0503f3f8a3e93dcdbbedb927c69b
2019-05-01 16:08:57 -04:00
Lei Yu
4ed1fdf212
Update padding for panel
...
Reuse the slice style that is used by contextual homepage.
Fixes: 131253950
Test: Manual
Change-Id: Iec5fbaec7d992a3aa084f6bd7176ff2582f69757
2019-05-01 12:46:05 -07:00
Pengquan Meng
e324f00e81
Merge "Disable 'Enable DSDS' switch for always dsds mode" into qt-dev
...
am: 7707133ec6
Change-Id: Ia068770daad2f035578508e7718c6b50b6e9768d
2019-05-01 12:41:09 -07:00
Lei Yu
d9ecc3ae9a
Update dialog text for untethered BT device
...
Fixes: 122672631
Test: RunSettingsRoboTests
Change-Id: I380308acbb7025461ef34aeec68e535189714bf3
2019-05-01 12:37:55 -07:00
Julia Reynolds
1613d883e8
Merge "Importance preference updates" into qt-dev
2019-05-01 19:17:13 +00:00
cosmohsieh
4f2a59802f
Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev
...
am: 4653879a22
Change-Id: If9c026f8e34e6b326c4dda6743aa374d27eb9122
2019-05-01 11:54:28 -07:00
Pengquan Meng
7707133ec6
Merge "Disable 'Enable DSDS' switch for always dsds mode" into qt-dev
2019-05-01 18:29:38 +00:00
Salvador Martinez
ac690d98c0
Merge "Fix null pointer in SubscriptionUtil" into qt-dev
...
am: 30d0e6c7d7
Change-Id: I0cba2206822450f14610d557f7844e8e1ea08abc
2019-05-01 10:59:11 -07:00
Amin Shaikh
b5f9c7c3a2
Merge "Update settings gesture icon." into qt-dev
...
am: d07911b0ca
Change-Id: I2e0abd0b733e15f05d489d12d0aaa47ea5f820f8
2019-05-01 10:52:43 -07:00
Tim Peng
a5d1d35bcf
Merge "Update "Play media to" display rule in SoundSetting" into qt-dev
...
am: 1bf8fb8535
Change-Id: Iadb043eb838aee8d3680bb7a295647ab3444a033
2019-05-01 09:44:47 -07:00
TreeHugger Robot
4653879a22
Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev
2019-05-01 15:48:41 +00:00
Julia Reynolds
090e67d938
Importance preference updates
...
- Use show on lockscreen setting
- Match design to notification shade guts
Test: robotests
Bug: 131290247
Bug: 128445911
Change-Id: I645b35191c8f22e751c264fd8ca13560f50b7582
2019-05-01 10:14:05 -04:00
Xiangyu/Malcolm Chen
4a0f2aedd5
Merge "Create enable MMS notification." into qt-dev
...
am: 25de66c030
Change-Id: I5744cd16cfa4e60f70ad7a069c7efd06d419f605
2019-05-01 07:13:26 -07:00
Sunny Goyal
3937b263ef
Merge "Restoring pinned shortcuts to original state after restore" into qt-dev
...
am: 011c18e22b
Change-Id: Ia2d627908b2d345806bc8fbca3cb8345580eb7a8
2019-05-01 07:12:22 -07:00
Raff Tsai
cbc56f8542
Merge "Fix Battery Fix slice can not displayed" into qt-dev
...
am: 9f7485897e
Change-Id: I0a1481ad480c8728684ab689e5ef37b063d8885e
2019-05-01 07:11:38 -07:00
Fan Zhang
cad5eb221c
Merge "Delete a broken test" into qt-dev
...
am: c824a0cb82
Change-Id: I03296dda94edb42b9c9911a8594aca35bcb6465b
2019-05-01 07:10:51 -07:00
Mill Chen
f323f072de
Merge "Add synonym to "Add an account"" into qt-dev
...
am: 5f45c17a60
Change-Id: Iaf7353b0c761cc5a05422e9f054cf087765eb98c
2019-05-01 07:09:57 -07:00
Yohei Yukawa
93ddd72aa9
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
...
am: 104906b344
Change-Id: I8972d88937c8b84b820292a19058d0dc431bea02
2019-05-01 07:09:07 -07:00
Antony Sargent
4e1273c53f
Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
...
am: 2740c4a052
Change-Id: I7fe388644b137549807d74b0a7888fdd9d7eab74
2019-05-01 07:08:19 -07:00
Sunny Shao
6fba302a0d
Merge "Show mobile data slice in Search even no SIM card" into qt-dev
...
am: 8b285f2355
Change-Id: Ibb7ab1b8b0425938092b27dad980ef0c11ee2b66
2019-05-01 07:07:32 -07:00
Fan Zhang
ecf5deee74
[automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev
...
am: c962ea0978
-s ours
am skip reason: SHA1 c962ea0978
skipped by user hansson
Change-Id: I439b8949e02e823d34b22c615caa4341db612247
2019-05-01 07:06:28 -07:00
Jonathan Scott
cccc56b0cf
Make ScreenPinningSettings behaviour consistent with LockTaskController.
...
Bug: 127605586
Test: Manual
Change-Id: I1d79fb529cfaf921657ef9eaca01b8a6a4e2dfef
2019-05-01 11:00:25 +01:00
Daniel Solomon
608ad6f632
Hide display white balance setting depending on accessibility
...
To avoid conflicting with display accessibility features, hide the
display white balance setting when these features are active.
Bug: 130263943
Test: make ROBOTEST_FILTER=DisplayWhiteBalancePreferenceControllerTest
RunSettingsRoboTests -j32
Change-Id: I9936a657521287a7a0482f2a934430bd79013cf3
2019-04-30 22:00:17 -07:00
Fan Zhang
3f7b3d653f
Merge "Remove parent activity from TTS_SETTINGS" into qt-dev
...
am: 87631db975
Change-Id: I7e3bf0d7fb79a6529e4b06cfe5e770148b867843
2019-04-30 21:58:18 -07:00
Lifu Tang
3ee7292958
Merge "Update location app stats" into qt-dev
...
am: 5bfa4b24e2
Change-Id: Ida6d56aa38861ae76654f7a01e2a0921bd1b5e6f
2019-04-30 21:57:34 -07:00
hughchen
4d33bdc909
Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev
...
am: 9efd0c9685
Change-Id: Iaf9dc9b055e5ae544d499d52437c57d609b196b4
2019-04-30 21:56:49 -07:00
Yi-Ling Chuang
191e38abec
Merge "Only shows two suggestion cards at once." into qt-dev
...
am: 15524dbaee
Change-Id: I628873293315d2850f95e8f42fbb011417dc50a5
2019-04-30 21:56:01 -07:00
Pengquan Meng
a40d2741f0
Disable 'Enable DSDS' switch for always dsds mode
...
Disable the switch in RadioInfo when the ro.boot.hardware.dsds is set.
Bug: 131440879
Test: manual
Change-Id: Ib4d3111fc639f44295a82b8790a0b780293b1aa8
2019-04-30 19:33:00 -07:00