Xiangyu/Malcolm Chen
ac800b27b2
[automerger skipped] Merge "Adding new strings needed for Enable MMS toggle." am: 3c6cb98ec0
...
am: bb95bb5f8b3b5a28e2e9
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
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
2019-05-01 16:23:23 -07:00
Salvador Martinez
1600a5ce1a
Merge "Fix null pointer in SubscriptionUtil" into qt-dev am: 30d0e6c7d7
...
am: ac690d98c0
2019-05-01 16:01:49 -07:00
Amin Shaikh
e2f2b15837
Merge "Update settings gesture icon." into qt-dev am: d07911b0ca
...
am: b5f9c7c3a2
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
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
2019-05-01 14:58:44 -07:00
Julia Reynolds
176f142f74
Merge "Importance preference updates" into qt-dev
...
am: 1613d883e8
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
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
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
2019-05-01 11:22:28 -07:00
Salvador Martinez
ac690d98c0
Merge "Fix null pointer in SubscriptionUtil" into qt-dev
...
am: 30d0e6c7d7
2019-05-01 10:59:11 -07:00
Amin Shaikh
b5f9c7c3a2
Merge "Update settings gesture icon." into qt-dev
...
am: d07911b0ca
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
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
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
2019-05-01 07:34:50 -07:00
Fan Zhang
0360305461
Merge "Delete a broken test" into qt-dev am: c824a0cb82
...
am: cad5eb221c
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
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
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
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
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
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
Xiangyu/Malcolm Chen
4a0f2aedd5
Merge "Create enable MMS notification." into qt-dev
...
am: 25de66c030
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
2019-05-01 07:12:22 -07:00
Raff Tsai
cbc56f8542
Merge "Fix Battery Fix slice can not displayed" into qt-dev
...
am: 9f7485897e
2019-05-01 07:11:38 -07:00
Fan Zhang
cad5eb221c
Merge "Delete a broken test" into qt-dev
...
am: c824a0cb82
2019-05-01 07:10:51 -07:00
Mill Chen
f323f072de
Merge "Add synonym to "Add an account"" into qt-dev
...
am: 5f45c17a60
2019-05-01 07:09:57 -07:00
Yohei Yukawa
93ddd72aa9
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
...
am: 104906b344
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
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
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: c962ea0978c962ea0978
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
Fan Zhang
7309f2c7a0
Merge "Remove parent activity from TTS_SETTINGS" into qt-dev am: 87631db975
...
am: 3f7b3d653f
2019-04-30 23:16:32 -07:00
Lifu Tang
1c0c74220d
Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
...
am: 3ee7292958
2019-04-30 23:11:07 -07:00
hughchen
aa729ebd4d
Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev am: 9efd0c9685
...
am: 4d33bdc909
2019-04-30 23:05:14 -07:00
Yi-Ling Chuang
ab5cfcdf33
Merge "Only shows two suggestion cards at once." into qt-dev am: 15524dbaee
...
am: 191e38abec
2019-04-30 22:57:18 -07:00
Lei Yu
2f862295fd
Merge "Fix a crash in battery settings page" into qt-dev am: 116d4f14dc
...
am: cdce15c670
2019-04-30 22:33:43 -07: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
2019-04-30 21:58:18 -07:00
