Commit Graph

27127 Commits

Author SHA1 Message Date
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
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
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
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
Jonathan Scott
cccc56b0cf Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug: 127605586
Test: Manual
Change-Id: I1d79fb529cfaf921657ef9eaca01b8a6a4e2dfef
2019-05-01 11:00:25 +01:00
Lifu Tang
1c0c74220d Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
am: 3ee7292958

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

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

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

Change-Id: I3b3f4ccaa1efb7461d381906ca92d507d8c00a05
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
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
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
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
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
TreeHugger Robot
30d0e6c7d7 Merge "Fix null pointer in SubscriptionUtil" into qt-dev 2019-04-30 23:43:42 +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
Fan Zhang
c824a0cb82 Merge "Delete a broken test" into qt-dev 2019-04-30 20:55:35 +00: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
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
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
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