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
Lifu Tang
3ee7292958
Merge "Update location app stats" into qt-dev
...
am: 5bfa4b24e2
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
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
2019-04-30 21:56:01 -07:00
Leon Liao
2250a8d36d
Merge "Replace the placeholder animation." into qt-dev am: fc20597133
...
am: 458f15a1da
2019-04-30 20:02:36 -07:00
Beverly
d781f1a2e0
Merge "Add null check to avoid settings crash" into qt-dev am: a02cbbf23f
...
am: 532ba82f14
2019-04-30 20:01:35 -07:00
Ilya Matyukhin
77faf64a86
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev am: 64693e31d9
...
am: e1a84e5c23
2019-04-30 20:00:48 -07:00
Julia Reynolds
4ad850af69
Merge "Fix visibility and editability of importance fields" into qt-dev am: 7c802e553f
...
am: 4c77fd575c
2019-04-30 19:59:59 -07:00
Beverly
43c5b3755b
Merge "Update DND strings - use pull-down shade" into qt-dev am: 34fb0485fa
...
am: aa4adeda1c
2019-04-30 19:59:10 -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
Lei Yu
cdce15c670
Merge "Fix a crash in battery settings page" into qt-dev
...
am: 116d4f14dc
2019-04-30 19:21:41 -07:00
lindatseng
99b22cba09
Avoid NPE in app storage page
...
Adding null check for ProviderInfo. Skip adding count to map if
the Provider cannot be found, to avoid NPE.
Fixes: 128368170
Test: Manual
Change-Id: I3d3b5301e6ca25a671077c9b93ada89be46e23fd
2019-05-01 01:27:25 +00:00
Leon Liao
458f15a1da
Merge "Replace the placeholder animation." into qt-dev
...
am: fc20597133
2019-04-30 17:28:03 -07:00
Beverly
532ba82f14
Merge "Add null check to avoid settings crash" into qt-dev
...
am: a02cbbf23f
2019-04-30 17:26:59 -07:00
Ilya Matyukhin
e1a84e5c23
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
am: 64693e31d9
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c
Merge "Fix visibility and editability of importance fields" into qt-dev
...
am: 7c802e553f
2019-04-30 17:25:17 -07:00
Beverly
aa4adeda1c
Merge "Update DND strings - use pull-down shade" into qt-dev
...
am: 34fb0485fa
2019-04-30 17:24:26 -07:00
TreeHugger Robot
30d0e6c7d7
Merge "Fix null pointer in SubscriptionUtil" into qt-dev
2019-04-30 23:43:42 +00:00
TreeHugger Robot
d07911b0ca
Merge "Update settings gesture icon." into qt-dev
2019-04-30 23:24:25 +00:00
TreeHugger Robot
1bf8fb8535
Merge "Update "Play media to" display rule in SoundSetting" into qt-dev
2019-04-30 23:07:28 +00:00
Xiangyu/Malcolm Chen
25de66c030
Merge "Create enable MMS notification." into qt-dev
2019-04-30 23:05:25 +00:00
TreeHugger Robot
011c18e22b
Merge "Restoring pinned shortcuts to original state after restore" into qt-dev
2019-04-30 21:51:35 +00:00
TreeHugger Robot
9f7485897e
Merge "Fix Battery Fix slice can not displayed" into qt-dev
2019-04-30 21:48:22 +00:00
Amin Shaikh
e360f9f037
Update settings gesture icon.
...
Fixes: 130148532
Test: visual
Change-Id: Ic5fe6dbd5ae726edcd9ad27e512c627aebf554a9
2019-04-30 17:29:04 -04:00
Fan Zhang
c824a0cb82
Merge "Delete a broken test" into qt-dev
2019-04-30 20:55:35 +00:00
Fan Zhang
c34d9c9b48
Merge "Tweak paddings for apps filter in app info screen" into qt-dev am: 2da861cd52
...
am: abdcf0038d
2019-04-30 13:35:55 -07:00
Pasty Chang
8b6857951c
Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5
...
am: 9f8406d876
2019-04-30 13:34:49 -07:00
TreeHugger Robot
5f45c17a60
Merge "Add synonym to "Add an account"" into qt-dev
2019-04-30 20:12:40 +00:00
Malcolm Chen
f3425dd778
Adding new strings needed for Enable MMS toggle. am: 3b5a28e2e9
...
am: 6baa0e1422
2019-04-30 11:55:11 -07:00
Fan Zhang
abdcf0038d
Merge "Tweak paddings for apps filter in app info screen" into qt-dev
...
am: 2da861cd52
2019-04-30 11:42:32 -07:00
Pasty Chang
9f8406d876
Merge "Set QR scan activity to light theme in setup flow" into qt-dev
...
am: 54cddc70e5
2019-04-30 11:41:18 -07:00
Malcolm Chen
6baa0e1422
Adding new strings needed for Enable MMS toggle.
...
am: 3b5a28e2e9
2019-04-30 11:40:29 -07:00
Fan Zhang
e2e104f563
Delete a broken test
...
The test has been broken for a while.
Fixes: 120505691
Test: robotest
Change-Id: I92537d1676ba1dc94595e87893ca7324d4740a70
2019-04-30 11:37:21 -07:00
TreeHugger Robot
104906b344
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
2019-04-30 18:31:13 +00:00
