PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,258 Commits 1 Branch 0 Tags
e98ca67cbe761d20392a06c6dd6be4ea5c18bccc
Commit Graph

62258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
86ade48e56 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 25a0edfb7c 
Change-Id: I895a22b5e89fc49bf5edb36af8e97c84b553de36
 2020-04-17 02:36:31 +00:00
Edgar Wang
8dbe5c377d Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 
Change-Id: I6e85c64be52f96cc93bbf74a5d5bd46f8d89d975
 2020-04-17 02:35:58 +00:00
Edgar Wang
25a0edfb7c Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d 
Change-Id: Ied0879d5228de1061d4c0cf931be2bcd7ec05b58
 2020-04-17 02:13:43 +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
4badcb534a Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 
Change-Id: I1cee2e94828a984510e891b42cd9c933aece1241
 2020-04-16 23:28:40 +00:00
Eugene Susla
13ac9a08b7 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: c3694e0673 
Change-Id: I109895eab02f67829b160e90adacb0dcb826e546
 2020-04-16 23:28:21 +00:00
Eugene Susla
c3694e0673 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 
Change-Id: If3c06332beb2aec7658af48afd5354e4aa5fe050
 2020-04-16 23:12:05 +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
91c31662d9 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27 
Change-Id: Ie097c989f8d2e9baf11825e4267b9503f8946f3a
 2020-04-16 16:29:59 +00: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
abf784e5a2 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f 
Change-Id: I6a31ded37ad8365bf19a86eae4b709128f3fd944
 2020-04-16 14:26:27 +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
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
579bdff443 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 
Change-Id: Id453df151f84942547c7ef96917264b1f198b26d
 2020-04-16 11:32:00 +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
Menghan Li
3b1cecd0c7 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 1d2d72a716 
Change-Id: Ic2424209807443f1bc48631c3a11a573a7cf88a8
 2020-04-16 06:53:06 +00:00
tim peng
6ba577b3e0 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 93b092fff8 
Change-Id: I79d6d0c213f05cb6ffa78f58c8a75044d5ac9cf5
 2020-04-16 06:52:55 +00:00
Menghan Li
fd510cc5ae Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 am: 4ee3e3b983 
Change-Id: I3a6125afcaafd195fd9a3ce7baca64aff52db93e
 2020-04-16 06:52:49 +00: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
Menghan Li
1d2d72a716 Merge "Refines animation for caption preferences tutorial" into rvc-dev am: 5970337d26 
Change-Id: Ib29cdca795c1b9432d0b377ed2fff2d269e2da3f
 2020-04-16 06:37:26 +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
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
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
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
4dbd613b0a Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 32fe4e1bd1 
Change-Id: Ic14992212b9b37e7532f9fdba542e5e6e8cfc3dd
 2020-04-15 18:15:03 +00:00
Calvin Pan
edcbde0ea7 Merge "Add missing NR network mode in setPreferenceValueAndSummary" into rvc-dev am: 0758056d04 am: b377a53f9c 
Change-Id: I3bb11db75b71a99cf4cf20043d4e050e2161c56e
 2020-04-15 18:00:04 +00:00
TreeHugger Robot
a433082399 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 89e3b29558 
Change-Id: I62b558e4bb35221e891f5889fe2a9c261e72b181
 2020-04-15 17:58:44 +00:00
Automerger Merge Worker
154b539a4a Merge "Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4f1175397c" into rvc-d1-dev-plus-aosp 2020-04-15 17:55:51 +00:00
PETER LIANG
24c0e881b8 Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4f1175397c 
Change-Id: I8cc1ec8f95edc3bc424c71b691ec7d130a0cc694
 2020-04-15 17:55:46 +00:00