Commit Graph

52682 Commits

Author SHA1 Message Date
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
Fan Zhang
1f20c4cf68 Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev am: 4fe327858f
am: 7ba7f47ae3

Change-Id: I263b518ea5982ffb6012dc6fabdf5518435963f1
2019-04-30 00:24:25 -07:00
Lei Yu
4f207934a4 Merge "Hide number label if info is opportunistic" into qt-dev am: 1a66d9b22f
am: f6ff7a02fb

Change-Id: I5a1ccdc55dd564fe579c1db89704fd7f6c06e83e
2019-04-30 00:23:16 -07:00
Andy Chou
114fa266ef Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev am: 8c16ef2906
am: 5f82b6e72e

Change-Id: Idc33c26d5dae95ac9a1f5dd9c769c2b9a1351d0b
2019-04-30 00:22:23 -07:00
Chandan Nath
1a96c61193 Merge "Always show backup settings (even if backup is deactivated)." into qt-dev am: 2f2a3c4055
am: 2ab7fab9a8

Change-Id: I7811cbe094eaf4d3127c15c231969d8f38c19a4e
2019-04-30 00:21:33 -07:00
hughchen
b7fb90ab6c Merge "Fix media output slice is empty even BT device is paired" into qt-dev am: 668edcfb95
am: a35353d687

Change-Id: I8c008f2b441287e43ff879b709009df996e9f5d7
2019-04-30 00:17:55 -07:00
Lifu Tang
8968de16d4 Merge "Add timestamp to recent used apps" into qt-dev am: 80be930357
am: 68310109ef

Change-Id: I4e37834459b5019c18d41715f287b504ab242eec
2019-04-30 00:17:02 -07:00
Kevin Chyn
d32285a9ce Merge changes I74d677dc,I17f4db85 into qt-dev am: 8888d346d1
am: 4fcd3c6056

Change-Id: I37f70f7a3ad57ea9c1dcd1cd73bbcc490abaa937
2019-04-30 00:16:10 -07:00
Bill Yi
91eefed117 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 47b32d0939 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf4f2eb62d1e07c2a766bce1cda027db96bbf7c2
2019-04-30 00:15:16 -07:00
Lei Yu
a7578022f0 Merge "Update color filter for battery saver mode" into qt-dev am: 30991963e4
am: c86d7fb326

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

Change-Id: I7c96c514fb4f665adc9095036f9fd6bb437fdbc2
2019-04-30 00:15:00 -07:00
Fan Zhang
724595db54 Merge "Include always ask button in SIM picker dialog" into qt-dev am: d414c64dc3
am: 85dde88aa5

Change-Id: Ic1805319330e8d9f819d15c158d3c12e65c6d11b
2019-04-30 00:14:26 -07:00
Antony Sargent
ec2dcef796 Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
am: 06da2980a0

Change-Id: I924eb0f0fdf4f95294b45f171f752784f8db4604
2019-04-30 00:14:16 -07:00
Salvador Martinez
430814af13 Merge "Add keywords for battery saver schedule" into qt-dev am: 3825e09706
am: 958dea2303

Change-Id: I6c2d47cf87d9d92846a577466a792a3efbdb3941
2019-04-30 00:13:21 -07:00
Raff Tsai
f34d143d0c Fix Battery Fix slice can not displayed
Fixes: 123174237
Test: manual
Change-Id: I3b349a27be5ecffbc64aaccb709c443f6ada875b
2019-04-30 15:13:12 +08:00
Andrew Sapperstein
706db87435 Merge "Remove "data usage" from search." into qt-dev
am: 655e2e55e9

Change-Id: I4dd878cc6377d15c2cfbebef9555c9b6c384e1c8
2019-04-30 00:13:08 -07:00
Salvador Martinez
cf61ab8596 Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
am: 0677441d03

Change-Id: Ie2e6be0afaf37d30f806af478aa00d00418c5677
2019-04-30 00:12:28 -07:00
Andrew Sapperstein
e8bd1c48d0 Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
am: 067332ca9e

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

Change-Id: I08bd28a91fa7d6e4d13d9844a72e3b26036f60a2
2019-04-30 00:11:37 -07:00
Yanting Yang
f1934ac7f7 Merge "Improve the latency of NotificationChannelSlice" into qt-dev am: c7564be562
am: 4bcd5b2cfd

Change-Id: I46d84a85ea875ece0ef68246521d55d1d993d837
2019-04-30 00:11:32 -07:00
Fan Zhang
7ba7f47ae3 Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 4fe327858f

Change-Id: Ieaaf0c62fb2e4d5d6aa25ccd2cc62ad2dea04a41
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb Merge "Hide number label if info is opportunistic" into qt-dev
am: 1a66d9b22f

Change-Id: I5163816c04b825a98067e63db18d4020dfbcdcd1
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
am: 8c16ef2906

Change-Id: I2b024b585edf065d94d9f25dc97d333bf3a289c3
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8 Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
am: 2f2a3c4055

Change-Id: Ic6af3ffd48b508d93bbda564187547c90249337f
2019-04-30 00:08:26 -07:00
hughchen
a35353d687 Merge "Fix media output slice is empty even BT device is paired" into qt-dev
am: 668edcfb95

Change-Id: If6fa5506edd2e89a1a725414ed791284825ad8a5
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef Merge "Add timestamp to recent used apps" into qt-dev
am: 80be930357

Change-Id: I9efc997ecef8785f9da838a5cbadb36e81006614
2019-04-30 00:06:49 -07:00
Kevin Chyn
4fcd3c6056 Merge changes I74d677dc,I17f4db85 into qt-dev
am: 8888d346d1

Change-Id: I0d6523d1a67b4dd1c99d30ebcdd3637535944983
2019-04-30 00:05:57 -07:00
Lei Yu
c86d7fb326 Merge "Update color filter for battery saver mode" into qt-dev
am: 30991963e4

Change-Id: Ida0eced5ae330de91a0f647f3f2c7eda60f1d8db
2019-04-30 00:05:05 -07:00
Fan Zhang
85dde88aa5 Merge "Include always ask button in SIM picker dialog" into qt-dev
am: d414c64dc3

Change-Id: I121e662ca5dad110ac53caa55cb8b72501e2bf4a
2019-04-30 00:04:22 -07:00
Salvador Martinez
958dea2303 Merge "Add keywords for battery saver schedule" into qt-dev
am: 3825e09706

Change-Id: If0efe8c77fa296dca1a9f5ab2638b9bf1be87617
2019-04-30 00:03:30 -07:00
Salvador Martinez
0677441d03 Merge "Fix broken dark ui test" into qt-dev
am: 1eb92917c9

Change-Id: I96fb30ab6a4fd1a0b82727c4e3969b2e59c5d721
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd Merge "Improve the latency of NotificationChannelSlice" into qt-dev
am: c7564be562

Change-Id: I86c35f4c8d4dde32592ddec09926e226dbcc0751
2019-04-30 00:01:51 -07:00
TreeHugger Robot
87631db975 Merge "Remove parent activity from TTS_SETTINGS" into qt-dev 2019-04-30 03:40:22 +00:00
TreeHugger Robot
5bfa4b24e2 Merge "Update location app stats" into qt-dev 2019-04-30 02:50:58 +00:00
TreeHugger Robot
9efd0c9685 Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev 2019-04-30 01:52:37 +00:00
cosmohsieh
636ad9d947 Fix modification of WifiDialog doesn't take effect on details page
When clicking modify menu option in detiails page, modification on
metered or privacy preferences in the WifiDialog does not effect
back to details page but only changing internal data of WifiDialog.
Adding callback to update those two preferences.

Bug: 130775713
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I74bfa5a9581dfae73894c3e9f73d1069a36fd16b
2019-04-30 09:32:27 +08:00