PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,080 Commits 1 Branch 0 Tags
0fcfa20db806cfb48900d8cf2e408cc0443de35c
Commit Graph

66080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3871ae9ba4 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 01652c79dc -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifb0b5284ee0043745b077674bf5e05479a919f34
 2020-04-16 16:16:21 +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
TreeHugger Robot
01652c79dc Merge "Import translations. DO NOT MERGE" 2020-04-16 16:01:34 +00:00
TreeHugger Robot
192ff6315d [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 803b14ed9f -s ours 
am skip reason: subject contains skip directive

Change-Id: I7d83530fd2a19356f0add6dcf5e6bc77741a0cc3
 2020-04-16 15:49:36 +00:00
TreeHugger Robot
803b14ed9f Merge "Import translations. DO NOT MERGE" 2020-04-16 15:37:05 +00:00
Tom Hsu
2464cecfe2 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" am: b22f5daf13 
Change-Id: Idd76e12881532f7d09d6a205bbde7ec4ab0da8f0
 2020-04-16 15:27:33 +00:00
Julia Reynolds
9584874663 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 am: d399bf68ca am: 83d71c1f8f 
Change-Id: I99f1a02fbcfbcd7c808094b124408b221019f2ae
 2020-04-16 15:27:28 +00:00
TreeHugger Robot
7cc0e2892f [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours am: 674dc8c05c -s ours am: d86bfc9abb -s ours 
am skip reason: subject contains skip directive

Change-Id: I320c9d14dd87f8142f3b37ccadf13b545591594b
 2020-04-16 15:27:17 +00:00
TreeHugger Robot
ff998c1dfb [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours am: 1236118a6e -s ours am: 06407ffc75 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie7b9f353b4c9be5bc038a252412c97e05312ffa8
 2020-04-16 15:26:51 +00:00
Julia Reynolds
88e216ecfd Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 am: 235cdb1681 am: 039fbbe558 
Change-Id: I3d81abfe7234da18de72e9bef82e9a0b4bd98ba7
 2020-04-16 15:25:55 +00:00
Julia Reynolds
b3c28393f6 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6 am: dbef46a5d5 
Change-Id: I61923f6b40f0c7300886682d67bcd6ea1f79b656
 2020-04-16 15:22:20 +00:00
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
83d71c1f8f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 am: d399bf68ca 
Change-Id: I5976b1870aa94a14bbcf38fd21041fe1a8b65e3e
 2020-04-16 14:56:48 +00:00
TreeHugger Robot
d86bfc9abb [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours am: 674dc8c05c -s ours 
am skip reason: subject contains skip directive

Change-Id: I316000e7890022a1ec64b7828faaddd49fe51c75
 2020-04-16 14:56:17 +00:00
TreeHugger Robot
06407ffc75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours am: 1236118a6e -s ours 
am skip reason: subject contains skip directive

Change-Id: I94d3d6fe492e9cdc8299e49b07bcca1e491d680a
 2020-04-16 14:55:58 +00:00
Julia Reynolds
039fbbe558 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 am: 235cdb1681 
Change-Id: Iedf11fe0a0e34213f0944247052c6ee86088e17d
 2020-04-16 14:55:04 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6 
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
 2020-04-16 14:53:53 +00:00
Julia Reynolds
d399bf68ca Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 
Change-Id: Idbe504d740ffce1c54f4a255b6cad974fe52d64f
 2020-04-16 14:50:09 +00:00
TreeHugger Robot
674dc8c05c [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours 
am skip reason: subject contains skip directive

Change-Id: I66006b3f388e333d7809af9acd3a68ba1f74e3cc
 2020-04-16 14:50:00 +00:00
TreeHugger Robot
1236118a6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ied14a6c608b8d588bbb4abe839178eecead5cdde
 2020-04-16 14:49:54 +00:00
Julia Reynolds
235cdb1681 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 
Change-Id: I10c0ddc94426795bbe7518cc3eb5168a1d7610d7
 2020-04-16 14:44:00 +00:00
Julia Reynolds
fb328c7bc6 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 
Change-Id: I328786dafc9442534bda6c4118476610ede3fdfc
 2020-04-16 14:42:45 +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
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
Tom Hsu
b3bc413443 Revert "Fix failures on com.android.settings.network.ApnEditorTest" 
This reverts commit 66a530ec97.

Reason for revert: <have useless code>

Change-Id: Ic3190e168e74f196ef29a3af4e41fbb2ae129d17
 2020-04-16 13:08:16 +00:00
TreeHugger Robot
83e53b0f4d Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334 am: 1aaa1cad3f am: af8a4c4f02 
Change-Id: I7d67949ee687935438c35b8e4fb900ac21e17d88
 2020-04-16 12:15:00 +00:00
TreeHugger Robot
a074b97f99 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443 am: 742e5af8f9 am: 6588e7d549 
Change-Id: I5c2b624f8c8421fe0c364589ad2cb181e6b9cfbf
 2020-04-16 12:14:54 +00:00
TreeHugger Robot
6b3011e95e Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860 am: 6313dd37e9 
Change-Id: Id2e89734ff86660f209987c7c7952894a7a10006
 2020-04-16 12:14:46 +00:00
TreeHugger Robot
af8a4c4f02 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334 am: 1aaa1cad3f 
Change-Id: Ib55594a26bd68469e3bd37ca6ff4c76f636866e9
 2020-04-16 11:58:43 +00:00
TreeHugger Robot
6588e7d549 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443 am: 742e5af8f9 
Change-Id: I47e600f05804318c7b72f3761272c7c304400751
 2020-04-16 11:58:30 +00:00
TreeHugger Robot
1aaa1cad3f Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334 
Change-Id: I307706f75aaf5fb6ae332b38b7faa0f96d2c2cf9
 2020-04-16 11:58:00 +00:00
TreeHugger Robot
6313dd37e9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860 
Change-Id: I27ec15f9f0e3c9a6902b1754177b4d93d6c6c655
 2020-04-16 11:57:47 +00:00
TreeHugger Robot
742e5af8f9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443 
Change-Id: I4a400c4dc12ff76e7454a464366fb602af88e12e
 2020-04-16 11:47:36 +00:00
TreeHugger Robot
3c290d9860 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 
Change-Id: Ib12d4514907430e7987d3500a731dbbaad845252
 2020-04-16 11:47:06 +00: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
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
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
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