Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,168 Commits 1 Branch 0 Tags
22886ad990de97c584fa34e1cdd4b7aa78af0927
Commit Graph

31190 Commits

Author SHA1 Message Date
Yanting Yang
aefa9ea849 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 
Change-Id: I0296e6afd75136175907f6dbf7ee80b30762d31f
 2020-04-17 09:46:48 +00:00
Yanting Yang
e611ebfb33 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 
Change-Id: I23093ff82e7a4b5e51570653d1dfa015f09da675
 2020-04-17 09:26:42 +00:00
Yanting Yang
674e2c23a3 Merge "Do not generate copyable slices for Settings Search" into rvc-dev 2020-04-17 09:06:28 +00:00
Yanting Yang
b6c30a2c31 Do not generate copyable slices for Settings Search 
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.

Therefore, we don't need to generate copyable slices in Settings
anymore.

Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI

Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
 2020-04-17 13:25:22 +08:00
Tom Hsu
4cf73d2013 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 
Change-Id: I15e426aa232e07314e16c1cf875525cc645fe4ea
 2020-04-17 04:44:32 +00:00
Tom Hsu
68f1de2a53 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 
Change-Id: I3f950f8a09bc89fe6769206ac5d2d2c1e2648478
 2020-04-17 04:22:44 +00:00
Tom Hsu
a733ead043 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 
Change-Id: Ifd84da0751b08efa551bcde8a3d7a2c21b2e4f20
 2020-04-17 04:22:28 +00:00
Tom Hsu
7c84dc9959 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev 2020-04-17 04:01:10 +00:00
Zhen Zhang
9ed9c96d7c Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 
Change-Id: Id92f2edb0527b8f27a7c838a778831639c68d80a
 2020-04-17 03:22:45 +00:00
Zhen Zhang
5d6960e996 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 
Change-Id: Icf8bd0a19597127e27b6b736123143dc431fbabf
 2020-04-17 03:05:33 +00:00
Zhen Zhang
987a70e750 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 
Change-Id: If882edbe92b6efa5407be82528664b80f20d3e3f
 2020-04-17 03:05:22 +00:00
Weilun Du
f8757b7112 [Settings] Fix crashes caused by null bluetooth adapter and ethernet 
manager

Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
(cherry picked from commit 08e95d0db0)
 2020-04-16 16:56:28 -07:00
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest 
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
 2020-04-17 03:45:40 +08:00
TreeHugger Robot
bafc52f0f0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c 
Change-Id: I3c86265ed7e91afe94b7b36ec2252f998758ea2c
 2020-04-16 16:29:43 +00:00
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
 2020-04-16 16:16:22 +00:00
TreeHugger Robot
8f39c1380c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
 2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
 2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
 2020-04-16 14:12:43 +00:00
Julia Reynolds
f1801907d8 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
 2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
TreeHugger Robot
30fdfef476 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 
Change-Id: I392761026ae6e0bd76b5612a2794063c3591ef18
 2020-04-16 11:31:47 +00:00
TreeHugger Robot
3ca1b39596 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 
Change-Id: I483ba72fa1243efd2822b778b1621a431df200e3
 2020-04-16 11:15:56 +00:00
TreeHugger Robot
8142527b35 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 
Change-Id: Ibeb68b99a9c40bc61edc9706d596809d0c11e4f0
 2020-04-16 11:15:44 +00:00
TreeHugger Robot
158bbe17f3 Merge "Support another new intent for mainline module intent" into rvc-dev 2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942 Support another new intent for mainline module intent 
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.

Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
 2020-04-16 17:35:38 +08:00
Tsung-Mao Fang
b3bb7a0237 Fallback to AOSP emergency info if the original intent is broken 
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.

Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
 2020-04-16 17:23:52 +08:00
tim peng
5c68b4a9a8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e 
Change-Id: I24505a511d0932c2ea17baad7750c1701d247d5a
 2020-04-16 06:52:38 +00:00
tim peng
93b092fff8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 
Change-Id: Ice66c6c264c880246dbeec4e072fa1f902294fcb
 2020-04-16 06:37:19 +00:00
tim peng
4d97cc4e8e Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 
Change-Id: Ia96f690a596633fab838eac2c5be99eec92508fc
 2020-04-16 06:37:06 +00:00
tim peng
ea3a83e288 Merge "Incorrect panel layout after rotation" into rvc-dev 2020-04-16 06:10:15 +00:00
Julia Reynolds
e3cb4f094e Launch subscreens with the correct user 
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
 2020-04-15 17:36:11 -04:00
TreeHugger Robot
5e3b8cf66f Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab 
Change-Id: Ib3b31a62ea3f868b7e6f573e2df5a26951cfd44d
 2020-04-15 17:55:41 +00:00
Calvin Pan
a64c7679a0 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d 
Change-Id: Ia015e81cc3d9f485272cd918bd8bc2e1b5e39b3d
 2020-04-15 17:49:27 +00:00
TreeHugger Robot
de064c6c54 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe 
Change-Id: I5bb6c994ccf6dca6d61f843fd1f8846875be2688
 2020-04-15 17:49:09 +00:00
PETER LIANG
f64b990432 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 
Change-Id: I28a47ba352e2eef548f7a9acd2ee1299d9f441d6
 2020-04-15 17:48:49 +00:00
Rubin Xu
9e1c6293d1 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 
Change-Id: I0114acce3b613d387049bcfe30918821637d7860
 2020-04-15 17:48:22 +00:00
TreeHugger Robot
8a28fb2b7e Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 
Change-Id: Ifae44e30175e531432182b3301d4ca8964e213d7
 2020-04-15 17:46:22 +00:00
TreeHugger Robot
32fe4e1bd1 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f 
Change-Id: I588b338d4e49d5ee7f2d5fdbba6bf96795805385
 2020-04-15 17:43:29 +00:00
TreeHugger Robot
10052a54ab Merge "Update flows for notification history" into rvc-dev am: 79a38a733f 
Change-Id: Iad8a918c924115a7cbd04fa160dcf7be9a68fee8
 2020-04-15 17:41:53 +00:00
TreeHugger Robot
79a38a733f Merge "Update flows for notification history" into rvc-dev 2020-04-15 17:32:47 +00:00
TreeHugger Robot
8910d9cae0 Merge "Revert "Don't write user_switcher_enabled value when enter this Settings"" into rvc-dev am: e13a54c438 am: 6c2c780fd8 
Change-Id: Ifce877e9902bc841c68030d795c496a94272dca4
 2020-04-15 17:29:09 +00:00
Calvin Pan
106c2d210d Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 
Change-Id: I32dd168ae94fa39923e373a0b25a8012998e2c45
 2020-04-15 17:28:40 +00:00
Calvin Pan
b377a53f9c Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 
Change-Id: I217e0e1697fc78ca01ceec0168b06621a425b8fc
 2020-04-15 17:28:27 +00:00
TreeHugger Robot
65353e9dfe Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf 
Change-Id: I7c13a0f6adeda0689911848c799a551f27971b99
 2020-04-15 17:28:17 +00:00
TreeHugger Robot
89e3b29558 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf 
Change-Id: I52c901e432b8090433c81673475755f85bef9c12
 2020-04-15 17:27:22 +00:00
PETER LIANG
4f1175397c Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 
Change-Id: I5164350beee94ecf01a879546a085971d8b37914
 2020-04-15 17:26:48 +00:00
PETER LIANG
4c7a690479 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 
Change-Id: I0f135b960440a997116e3cb6e79b2d5380cb7aad
 2020-04-15 17:26:37 +00:00
Rubin Xu
b87ed9fac5 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 
Change-Id: I17cc8fb5d338336c091f6620cc015880efb0c83b
 2020-04-15 17:25:43 +00:00
Rubin Xu
d5a33f2a95 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 
Change-Id: Iae4d6b732a6da338aa7e6488402d5b21150669ec
 2020-04-15 17:25:30 +00:00