PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,358 Commits 1 Branch 0 Tags
52685bb1900606be24cf064c23faecc30affc30a
Commit Graph

61358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zhen Zhang
7e3e5dfa06 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev 2020-04-17 02:56:50 +00:00
Edgar Wang
d6379749f5 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 23b5b359a0 
Change-Id: I89c2d1cc0d87dd3ad6c44aa19a864e5b952d224a
 2020-04-17 02:49:07 +00:00
Edgar Wang
23b5b359a0 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 
Change-Id: Idc8b2c8b62d0f66783c286e526fce434d1581442
 2020-04-17 02:36:11 +00:00
Edgar Wang
27c1b456a5 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d 
Change-Id: I48970cfd18aef705790b20a6af6e5e9a08a1bc1a
 2020-04-17 02:13:30 +00:00
Edgar Wang
2b01f9ba7d Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev 2020-04-17 01:53:00 +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
Eugene Susla
5cfdd8ad6b Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: d088583349 
Change-Id: I854650864de7323c517e9e219c991411d2626da3
 2020-04-16 23:42:32 +00:00
Eugene Susla
d088583349 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 
Change-Id: I34a643bf08482d3bbbdc8e97f24377082593dd2f
 2020-04-16 23:28:19 +00:00
Eugene Susla
1184cec4a2 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 
Change-Id: Ifc857fe8d776d8353d8787a9ce0521f7495a821e
 2020-04-16 23:12:00 +00:00
Eugene Susla
ff8b793427 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev 2020-04-16 22:52:45 +00: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
90dbc28e57 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 
Change-Id: I6a9c98ab6eb996c678bd5c9e005959a5449dbfc6
 2020-04-16 16:42:19 +00:00
TreeHugger Robot
58b434ad02 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c 
Change-Id: I0b32dd33d9713759978b16effc55bbe2e197fff6
 2020-04-16 16:29:56 +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
5b949236c4 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e 
Change-Id: I52a20c4411220162db138f6f9b5e8bdc0c07084e
 2020-04-16 14:42:43 +00:00
TreeHugger Robot
307ee6b828 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:26 +00:00
TreeHugger Robot
15a22292f8 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:23 +00:00
Julia Reynolds
34c66fd94e Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 
Change-Id: I8ec8602c1e8753ce03d4c6acc75dcdf58be8c24e
 2020-04-16 14:26:36 +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
Sunny Shao
d63c5ebff5 Fix incorrect app count displayed under special app access 
- This special app Google Play services will change its hasLauncherEntry
  value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
  receiving the onLauncherInfoChanged callback.

Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
 2020-04-16 21:38:03 +08:00
TreeHugger Robot
c3143fb334 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 
Change-Id: I56704eb396e7cd5d0ba984cea17383713af0b4e1
 2020-04-16 11:46:57 +00:00
TreeHugger Robot
53d317a4d0 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 
Change-Id: I4d28d4e61aa47db8c4b6e172069605b283a50585
 2020-04-16 11:31:59 +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
Menghan Li
e60b873a58 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 am: 26a36e81b0 
Change-Id: I59c99e105c023d56a6c201b1629c4777d28f7f12
 2020-04-16 07:05:14 +00:00
tim peng
291866434b Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 2bd8c71b27 
Change-Id: I4b2c72961585c9af9f4092ab8a8bd6fab468991a
 2020-04-16 07:04:38 +00:00
Bill Yi
068172640a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3d4a999dcb0a53ea7b9d1b8dcdbff99972539d2c
 2020-04-15 23:55:43 -07:00
Menghan Li
26a36e81b0 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 
Change-Id: Ie699bf850c661445e5c773f34359826b21d7f855
 2020-04-16 06:52:59 +00:00
tim peng
2bd8c71b27 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e 
Change-Id: Id359b3065edeb9aed8bf0c1f4f01b6f7c553c095
 2020-04-16 06:52:52 +00:00
Menghan Li
4ee3e3b983 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 
Change-Id: Ic53a132347c296c936bd498c543fab7afce51a2c
 2020-04-16 06:37:21 +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
205846c9a2 Refine inputRange layout in output switcher 
Bug: 154181365
Test: build pass
Change-Id: Idee9042af6b19a358938752d2ee72bae07eb092a
 2020-04-16 06:35:23 +00:00
Menghan Li
5970337d26 Merge "Refines animation for caption preferences tutorial" into rvc-dev 2020-04-16 06:25:03 +00:00
tim peng
ea3a83e288 Merge "Incorrect panel layout after rotation" into rvc-dev 2020-04-16 06:10:15 +00:00
Bill Yi
c911af6763 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic6695a1ecc2c9a11a8334b12878fe6370012b276
 2020-04-15 22:34:47 -07:00
Eugene Susla
596662c52e Implement auto revoke user whitelist intent handler 
Bug: 153607914
Test: presubmit
Change-Id: I22288d0a963fd03e38841a9f66c342f6eb283149
 2020-04-15 15:04:11 -07: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
79a1fa33a2 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4 
Change-Id: I399114c2baf7aa34ea33dc3a84d181ea26641391
 2020-04-15 18:34:03 +00:00
Calvin Pan
d530ee73b7 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d am: 4c877e1495 
Change-Id: I1de467bf76fc9491d926c509d8690852198febce
 2020-04-15 18:19:49 +00:00
TreeHugger Robot
798bc7abd9 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c 
Change-Id: Idf8cede770c0ffd4af888e7dafe383c5d185f8a8
 2020-04-15 18:18:58 +00:00
PETER LIANG
53bf408b10 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4c7a690479 am: be6265865c 
Change-Id: Icc5ca67e34dfb321ddca91c507736ad57efd6a2b
 2020-04-15 18:18:18 +00:00
Rubin Xu
2edcafc323 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da 
Change-Id: I4e8633ddb9fb2dd65280f1ddd377942910ee4876
 2020-04-15 18:18:03 +00:00
TreeHugger Robot
0f7b584db3 Merge "[5G settings UI] add UI for the 5G limited VoLTE dialog" into rvc-dev am: 566d9f49bd am: 00fea22696 am: 62b01fdf6f 
Change-Id: Ie90c3bbf3288f1a6282dd48377e134ece912f41e
 2020-04-15 18:16:31 +00:00
TreeHugger Robot
9ade4f4cb4 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab 
Change-Id: Ia93b4fa2b891a50ea8b59941fa5eefe4f0da0164
 2020-04-15 18:12:01 +00:00
Calvin Pan
4c877e1495 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: 106c2d210d 
Change-Id: I3ed59308b803bf841eb3ab049fac823ce33b93eb
 2020-04-15 17:50:31 +00:00