Commit Graph

52567 Commits

Author SHA1 Message Date
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
Leon Liao
2250a8d36d Merge "Replace the placeholder animation." into qt-dev am: fc20597133
am: 458f15a1da

Change-Id: I142dd50313c028bcb82263b3f8152785e776d4f5
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

Change-Id: Iede8f734ff7524efd93c6f7480077fc483c07b88
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

Change-Id: Ib2cc2e7ccf0f01fe6f5156e593515ff21556e232
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

Change-Id: I9f0e7f1e13082d86bd9dd3bf50fb3dc70775f606
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

Change-Id: I4f3d5b6c3453e71d7bfa65ac8e0c8da573fbac48
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

Change-Id: Icf99350b41c88a6f3f6aaafd34477e5af57a49d3
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

Change-Id: I00743475bc757c197a1b53f8f3af90ab01c3eb82
2019-04-30 17:28:03 -07:00
Beverly
532ba82f14 Merge "Add null check to avoid settings crash" into qt-dev
am: a02cbbf23f

Change-Id: I2f142ae998946dd84fbb4c0e46b3d48b94b0ade3
2019-04-30 17:26:59 -07:00
Ilya Matyukhin
e1a84e5c23 Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
am: 64693e31d9

Change-Id: I93a19028b425eadb10317b93cc5de7a60f9ccaa3
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c Merge "Fix visibility and editability of importance fields" into qt-dev
am: 7c802e553f

Change-Id: I84ed085ac5dba8423f6d49beb2045c8a9460c6ed
2019-04-30 17:25:17 -07:00
Beverly
aa4adeda1c Merge "Update DND strings - use pull-down shade" into qt-dev
am: 34fb0485fa

Change-Id: If173adf304c1ac232f34bc852df93873fd06f25b
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

Change-Id: I06af4ae8b331706ce5916cc7b4c3d58e05976541
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

Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
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

Change-Id: I75173e22c9302f066b7aa81879a9ce38824e58b9
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

Change-Id: I64d9c58d2ccca79ad461f79106d508ac62e84f1f
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

Change-Id: I93fb36b2a44b37484f938a3a2066c0b5767de021
2019-04-30 11:41:18 -07:00
Malcolm Chen
6baa0e1422 Adding new strings needed for Enable MMS toggle.
am: 3b5a28e2e9

Change-Id: I28547d24978b048d9d3145520dce369daea2705f
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
Sunny Goyal
ae788a1631 Restoring pinned shortcuts to original state after restore
Creating an no-op backup agent in settings. This ensures that
we get onRestoreFinished callback after restore is finished where we
can update all pinned shortcuts.

Bug: 110016648
Test: Verified backup->clear-data->restore path on device
Change-Id: Id14d0792d60ba08d97078a31a81d2b63ab8ce109
2019-04-30 10:25:40 -07:00
Salvador Martinez
b5d471c19b Fix null pointer in SubscriptionUtil
Sometimes we get null sub info which causes a crash. This just
makes it so that if we see that we treat it as inactive since
there isn't really a world where an active null sub info makes
sense.

Test: atest SubscriptionUtilTest
Bug: 131603073
Change-Id: Id5ecbecf011e19ff02d9465e0571b1d17c83de9a
2019-04-30 09:59:27 -07:00
TreeHugger Robot
2740c4a052 Merge "Add 'Erase SIM' to mobile network details page" into qt-dev 2019-04-30 16:47:54 +00:00
Clown SHEN
9d38cce756 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev am: fbcf3708a6
am: dba84b1781

Change-Id: I31cf1082ff2b1fb370aa6b398760edf338fcd94a
2019-04-30 08:13:53 -07:00
Clown SHEN
dba84b1781 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
am: fbcf3708a6

Change-Id: I9d3f7e0d3c5afe2c339401aceebaef82e6761d0e
2019-04-30 07:20:47 -07:00
cnchen
1c67af1762 "Change font size" tile should go to settings' font size page directly
Test: atest & manual test
Bug: 131374325
Change-Id: I878da8c22e315100ae50d3d34ff218c5d14e81d8
2019-04-30 19:54:18 +08:00
TreeHugger Robot
8b285f2355 Merge "Show mobile data slice in Search even no SIM card" into qt-dev 2019-04-30 11:05:37 +00:00
TreeHugger Robot
c962ea0978 Merge "Delete bad translation for a few strings" into qt-dev 2019-04-30 09:31:43 +00:00
Mill Chen
fb4f7f8ab7 Add synonym to "Add an account"
To index the term "work profile" for "Add an account" setting, we added
a synonym to this setting.

Fixes: 111519999
Test: manual
Change-Id: Iabaac8d36433ef75790768fb46d14fe9b2553ad4
2019-04-30 17:31:43 +08:00
Bill Yi
5ed1e2db38 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 47b32d0939 -s ours
am: 91eefed117 -s ours
am skip reason: subject contains skip directive

Change-Id: I33333a8a340c5de44e9f2554b136b6d19a92450b
2019-04-30 00:29:17 -07:00
Andrew Sapperstein
d1bdd3809b Merge "Add a gap in the ordering for phone numbers." into qt-dev am: d464f67e31
am: d45dbafd4c

Change-Id: I83fbc72fbf3cb429c45a398c61ecf6f956ecce78
2019-04-30 00:28:54 -07:00
Antony Sargent
58dee76e8e Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev am: 06da2980a0
am: ec2dcef796

Change-Id: I3c3410ce3e332e547ff5bf51918da31eab6abf78
2019-04-30 00:27:53 -07:00
Andrew Sapperstein
0590293c31 Merge "Remove "data usage" from search." into qt-dev am: 655e2e55e9
am: 706db87435

Change-Id: I8f47f7834fdb634c19804b819f4c677db04b4d1c
2019-04-30 00:27:02 -07:00
Andrew Sapperstein
9ba6224b2f Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev am: 067332ca9e
am: e8bd1c48d0

Change-Id: Id7de9e739ff61a6cc13c54cbad96e6e9b0ce78a2
2019-04-30 00:26:10 -07:00
Raff Tsai
c3de3381ad Merge "Fix toggle button is enabled state but can't click" into qt-dev am: f9fd3b9e17
am: 5458399357

Change-Id: I048e88c4abf774b33b861b19cb523592ef805875
2019-04-30 00:25:17 -07:00