Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,935 Commits 1 Branch 0 Tags
85e39e899752df0aeab8409bf7c19cf3aee6e0cd
Commit Graph

38205 Commits

Author SHA1 Message Date
Bonian Chen
9e03c1fd57 Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 am: 612e3c409c am: 5c8755d1ca 
Change-Id: I0378b52cb0e41141e8e497631ed707371ba00e77
 2020-05-27 08:56:24 +00:00
Tim Peng
33914e738d Improve feedback when failing transferring a disconnected device 
-Set "failed" string for subtitle
-Add test case

Bug: 157139936
Test: make -j42 RunSettingsRoboTests
Change-Id: I1fcd51f954a63cbc9ac0e573e5a8bb43cca6f087
 2020-05-27 16:49:17 +08:00
Edgar Wang
8de2ab6a66 Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a 
Change-Id: I71b4e430f93e7637017a86f0c8c3adcc33d51716
 2020-05-27 08:31:43 +00:00
Bonian Chen
612e3c409c Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 
Change-Id: Ib5cf4d28e58881d0e16a9dc2364353707701a944
 2020-05-27 08:31:36 +00:00
Edgar Wang
c3ce91706a Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 
Change-Id: I3240458b67d03283dac6bb15d9fbef02ef7febeb
 2020-05-27 08:19:00 +00:00
Edgar Wang
4cec7ebd7a Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 
Change-Id: Ic0649f4c8488bf86ca366b60c468dc0e9dd5ef5f
 2020-05-27 08:18:56 +00:00
Bonian Chen
1a10069e6a Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d 
Change-Id: Ia0af2c7912b6d6af31ba7cb67747f9cd952f4428
 2020-05-27 08:18:36 +00:00
Bonian Chen
db253d31d8 Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d 
Change-Id: I06a1e5612384f99dea432ca90058269a661f4c4a
 2020-05-27 08:18:32 +00:00
Edgar Wang
e1a9a56451 Merge "Update summary of Gesture" into rvc-dev 2020-05-27 08:14:17 +00:00
Bonian Chen
d9d9a9be8d Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev 2020-05-27 08:08:35 +00:00
Automerger Merge Worker
57186a8a33 Merge "Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0 am: 0f540c174a" into rvc-qpr-dev-plus-aosp am: 2cab4b94df 
Change-Id: I18492f9798fd537fccc10ee65f1841a59187077b
 2020-05-27 06:36:02 +00:00
tim peng
d2b8f3662d Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484 am: ceb23093e9 am: 7a87480f82 
Change-Id: Id18ba750a4c3902f56375d44337bef6bf9bafbb6
 2020-05-27 06:32:45 +00:00
Yanting Yang
ed1e43053d Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0 am: 0f540c174a 
Change-Id: If6a4fd89c0ec9eb1eec29572643a6193f2f6a37c
 2020-05-27 06:21:35 +00:00
Yanting Yang
85b3154d07 Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: bf4f72b1fa 
Change-Id: I12a4863f08261286a917107ada5caec420736814
 2020-05-27 06:03:17 +00:00
tim peng
ceb23093e9 Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484 
Change-Id: I5a6472a35315e5a2add2e8029560382b8227eec8
 2020-05-27 06:02:40 +00:00
Yanting Yang
bf4f72b1fa Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e 
Change-Id: I6eb31ab162338e52a754dc098752feefa6d8dcd0
 2020-05-27 05:48:03 +00:00
Yanting Yang
78062db3c0 Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e 
Change-Id: I8e01770d89641ec469611bf15be4b68de0f22a3a
 2020-05-27 05:47:48 +00:00
TreeHugger Robot
1341f19feb Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: 32a2354bd5 am: 495bf0a826 
Change-Id: I2cdf13c428ffab6e79cb019a36329443edaa2896
 2020-05-27 05:47:38 +00:00
Paul Chang
a668edecb6 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813 am: 47272f8cab 
Change-Id: I387514103eb1c8da9e971dd39123aacd1b93278a
 2020-05-27 05:47:13 +00:00
tim peng
642f7582f3 Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e 
Change-Id: I1db8e8958622895cc818b115ae84758266bfab80
 2020-05-27 05:47:10 +00:00
tim peng
e20f765484 Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e 
Change-Id: Ie65855100b43c1f0829856d103f4dd5bde426d84
 2020-05-27 05:46:56 +00:00
TreeHugger Robot
495bf0a826 Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b am: 32a2354bd5 
Change-Id: I60c47ba3510fab941437f569f15f1fc5c6d3f0c7
 2020-05-27 05:37:42 +00:00
Yanting Yang
4e14ffd77e Merge "Improve scrolling performance for App Info page" into rvc-dev 2020-05-27 05:37:36 +00:00
Paul Chang
47272f8cab Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 am: 988b6fb813 
Change-Id: Ifefb16748f19b2b4fb74d14b8fd24f8b432c156e
 2020-05-27 05:37:32 +00:00
tim peng
49217faf8e Merge "Non-deselectable routes can be deselected" into rvc-dev 2020-05-27 05:32:34 +00:00
TreeHugger Robot
de8892ebae Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev am: bcc9f31b2b 
Change-Id: Ifc733843c6d4c3bfe5ff8f1b553ef154c7108d1c
 2020-05-27 05:25:39 +00:00
TreeHugger Robot
bcc9f31b2b Merge "Update Bluetooth AVRCP default version to 1.5" into rvc-d1-dev 2020-05-27 05:18:46 +00:00
Paul Chang
5cbb7a1eb7 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf am: 4da1f84e33 
Change-Id: I6eba1bc2cc500179579ab19b800b107d6be59845
 2020-05-27 05:16:20 +00:00
Paul Chang
b8301bceed Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf 
Change-Id: I66e57a0211b810dcd83017a30b87999f69927251
 2020-05-27 04:59:11 +00:00
Paul Chang
4da1f84e33 Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev am: f1fb7fb7cf 
Change-Id: I8708a3ea80d1d030347a932c3d676ecf88c1d8bb
 2020-05-27 04:58:51 +00:00
Paul Chang
f1fb7fb7cf Merge "Fix wrong line break in sub text on Bug report handler settings" into rvc-dev 2020-05-27 04:46:21 +00:00
TreeHugger Robot
99b295c285 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 am: 6c0e4e9e48 
Change-Id: Ibbf5efba18de6266f64a822dc022ede299c5ac60
 2020-05-27 04:17:14 +00:00
TreeHugger Robot
6c0e4e9e48 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 
Change-Id: Idc6fe44f5c60e9bc82b6209a832b3d574e72a47a
 2020-05-27 04:00:47 +00:00
TreeHugger Robot
eb1f444fb1 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev am: 6d93851386 
Change-Id: I98da412048dc0dbe100826809173763c70d7a15e
 2020-05-27 04:00:38 +00:00
TreeHugger Robot
6d93851386 Merge "Create new WifiEntryPreference if WifiEntry object changes" into rvc-dev 2020-05-27 03:46:25 +00:00
Treehugger Robot
6ea2228e31 Merge "Fix NPE if CarrierConfigManager is not available" am: d01838d8ce 
Change-Id: I5ff6cfcf79cfeec14571ae4f34ea74fd658025d3
 2020-05-27 01:52:00 +00:00
Adam Bookatz
e7465b0f5f Opening Multiuser doesn't toggle it on 
This does the following:
Simply opening Settings > Multiuser no longer
globally enables multiuser. The user would have
to actively toggle that switch to globally
enabled it.

(This reverts ag/7002640; a different solution for
that cl's bug is in the same topic as this cl.)

Bug: 137943217
Bug: 141372193
Bug: 149973281
Bug: 130270878

Test: manual: Settings > Multiuser doesn't turn on the systemui avatar
Test: manual: adb shell pm create-user A, does turn on sysui avatar

Change-Id: Ibfdd1dee408c7214d0a097c8d814dae87ffa82ac
 2020-05-26 23:01:56 +00:00
Brad Ebinger
525a07ec7f Fix NPE if CarrierConfigManager is not available 
Fixes: 155147094
Fixes: 155819375
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
Merged-In: Iecf3e385a88d18c7578eb520449f4042324e21f5
 2020-05-26 15:50:41 -07:00
Grace Jia
b7d745a7a0 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e am: fb719ecfc8 
Change-Id: Ic613d20f1756b05765fb02983f23f8fc7a4360fd
 2020-05-26 17:42:29 +00:00
Grace Jia
fb719ecfc8 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: 8e8386c677 am: 224812552e 
Change-Id: I7c786a4480d58caecf407129997c593dc1741509
 2020-05-26 17:28:17 +00:00
Grace Jia
3f0d810913 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 am: f29da1c2e7 
Change-Id: I422bea8785a02bcb68fb2d944099711393da0180
 2020-05-26 17:21:21 +00:00
Grace Jia
8e8386c677 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 
Change-Id: I91349e1d1051aadd264d60f48d32076629ad8a88
 2020-05-26 17:08:09 +00:00
Grace Jia
f29da1c2e7 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev am: 5c7f6d1b98 
Change-Id: Iecbd2c0627c28b68e76440cc2430e753a95fc94b
 2020-05-26 17:08:06 +00:00
Grace Jia
5c7f6d1b98 Merge "Close and disable SIM lock dialogs when SIM removed from device." into rvc-dev 2020-05-26 16:52:42 +00:00
Edgar Wang
e2b2797c42 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae am: f446e34b15 
Change-Id: I6977bca28cabda92f6c984fe54627c6c67d60652
 2020-05-26 15:45:07 +00:00
Edgar Wang
f446e34b15 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 am: 335ee91cae 
Change-Id: Ie6db2d1987c3d6964cdd09ed18a75a48367449e3
 2020-05-26 15:32:04 +00:00
Edgar Wang
331e53aae7 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 am: e72f014903 
Change-Id: I332b929c79d275251bcc5ee5a516cda4c094171d
 2020-05-26 15:17:01 +00:00
Edgar Wang
e72f014903 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 
Change-Id: Ie45e6eb70dd491face353ea1d92dcc38ca7a73be
 2020-05-26 15:05:05 +00:00
Edgar Wang
857867b809 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev am: f3ad1ec7b7 
Change-Id: I523f992fd67b31b6d0803454d3567a5c6e03894a
 2020-05-26 15:04:55 +00:00
Edgar Wang
f3ad1ec7b7 Merge "Change AppPicker theme from dialog to full screen" into rvc-dev 2020-05-26 14:49:04 +00:00