Lei Yu
add94d15ff
Merge "Update padding for panel" into qt-dev am: 9a4fa9bf0d
...
am: cd6415d73d
Change-Id: Ibd5521e6cd152447b846e8a1b5ce13a090105067
2019-05-02 00:55:03 -07:00
lindatseng
6855d34ff6
Merge "Avoid NPE in app storage page" into qt-dev am: 35efae7822
...
am: f51d1d234c
Change-Id: Iaecb7a454e9a17660a82b0440f130089fad31675
2019-05-02 00:41:02 -07: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
Xiangyu/Malcolm Chen
649294cb01
[automerger skipped] Merge "Adding new strings needed for Enable MMS toggle." am: 3c6cb98ec0
am: bb95bb5f8b
-s ours
...
am: ac800b27b2
-s ours
am skip reason: change_id If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c with SHA1 3b5a28e2e9
is in history
Change-Id: I670a826235beed1cfeaf4ce892f6dba96adc3050
2019-05-01 21:28:01 -07: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
Cn Chen
88faf90a29
Merge ""Change font size" tile should go to settings' font size page directly"
2019-05-02 02:00:40 +00: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
Julia Reynolds
57746eed0b
Merge "Importance preference updates" into qt-dev am: 1613d883e8
...
am: 176f142f74
Change-Id: I245505a348a449beed5666c58cb0eb0cc6b13638
2019-05-01 17:50:23 -07: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
Pengquan Meng
3aa1eac86c
Merge "Disable 'Enable DSDS' switch for always dsds mode" into qt-dev am: 7707133ec6
...
am: e324f00e81
Change-Id: I468e7f267baf0e104e1d8cf5824e99e507bc472c
2019-05-01 16:24:47 -07:00
cosmohsieh
0bf3cc1f3a
Merge "Fix modification of WifiDialog doesn't take effect on details page" into qt-dev am: 4653879a22
...
am: 4f2a59802f
Change-Id: I5fb1ca7ae3e9927ad103c2e7793abb8ee7b74836
2019-05-01 16:23:23 -07:00
Salvador Martinez
1600a5ce1a
Merge "Fix null pointer in SubscriptionUtil" into qt-dev am: 30d0e6c7d7
...
am: ac690d98c0
Change-Id: I69b7f210bbbef2bba3ef6792c128b806db07e90e
2019-05-01 16:01:49 -07:00
Amin Shaikh
e2f2b15837
Merge "Update settings gesture icon." into qt-dev am: d07911b0ca
...
am: b5f9c7c3a2
Change-Id: I90dd24bdc995f0f90fdeabeeaacba626d454a855
2019-05-01 15:55:28 -07:00
Tim Peng
7e39f6f359
Merge "Update "Play media to" display rule in SoundSetting" into qt-dev am: 1bf8fb8535
...
am: a5d1d35bcf
Change-Id: Ibc962a2b9476fdde34d77cd32303dba0e0f39c1d
2019-05-01 15:23:16 -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
Fan Zhang
856e8a4503
Delete bad translation for a few strings
...
- wifi_calling_mode_choices
- wifi_calling_mode_choices_without_wifi_only
Fixes: 130333622
Test: rebuild
Change-Id: Ie879f914b4c720842115e2d266eb7c44f358c36a
2019-05-01 11:47:50 -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
Xiangyu/Malcolm Chen
39e8aaba93
Merge "Create enable MMS notification." into qt-dev am: 25de66c030
...
am: 4a0f2aedd5
Change-Id: I508a0eb6ee8a23e9bcf6c6394af8e1860cfae31d
2019-05-01 11:22:28 -07: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
Sunny Goyal
ffe474de2f
Merge "Restoring pinned shortcuts to original state after restore" into qt-dev am: 011c18e22b
...
am: 3937b263ef
Change-Id: I42b5db6ee730f288e9820c877c6ca71bcfebd703
2019-05-01 07:35:41 -07:00
Raff Tsai
cd4731fb2f
Merge "Fix Battery Fix slice can not displayed" into qt-dev am: 9f7485897e
...
am: cbc56f8542
Change-Id: I1c29d29202897f1533447249781fc3522b759d0a
2019-05-01 07:34:50 -07:00
Fan Zhang
0360305461
Merge "Delete a broken test" into qt-dev am: c824a0cb82
...
am: cad5eb221c
Change-Id: Ia3baf3ef35e2520efb58c6dd85e70a2d3bca58a1
2019-05-01 07:33:55 -07:00
Mill Chen
1d7f051b41
Merge "Add synonym to "Add an account"" into qt-dev am: 5f45c17a60
...
am: f323f072de
Change-Id: I52e8f260aa4118c96376d32637ec6d774e22d9db
2019-05-01 07:32:57 -07:00
Yohei Yukawa
30a8d60a20
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev am: 104906b344
...
am: 93ddd72aa9
Change-Id: I96cfdd5db00559ec60fa127c87d9845bbe703744
2019-05-01 07:32:03 -07:00
Antony Sargent
d4f37bb46e
Merge "Add 'Erase SIM' to mobile network details page" into qt-dev am: 2740c4a052
...
am: 4e1273c53f
Change-Id: Ia925f6646eeb49564750dad9a055898ddbdd650f
2019-05-01 07:19:34 -07:00
Sunny Shao
fbe30c5bf7
Merge "Show mobile data slice in Search even no SIM card" into qt-dev am: 8b285f2355
...
am: 6fba302a0d
Change-Id: I917e58a68eecac6c28500eefab8ad4cc31f2087e
2019-05-01 07:18:45 -07:00
Fan Zhang
761b9931ff
[automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev am: c962ea0978
-s ours
...
am: ecf5deee74
Change-Id: If0271d04d703dc37ac26e6b8f880a52d848a4969
2019-05-01 07:17:54 -07: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