PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,299 Commits 1 Branch 0 Tags
1f15f102f49fbb4c8f962bc242dd40bf82fc8fe4
Commit Graph

60299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
56274ffaa3 [automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours 
am skip reason: subject contains skip directive

Change-Id: I17465ae7a650f532680446dc72eb315b9e16ba2d
 2020-03-12 10:49:42 +00:00
TreeHugger Robot
8697de6be3 Merge "DO NOT MERGE" into qt-qpr1-dev 2020-03-12 10:36:01 +00:00
Automerger Merge Worker
5fe624a009 Update ManageExternalStorageDetailsTest setUidMode am: 143ec3ec2b 
Change-Id: Ib4a750e64f0e012e94898c15e1f369561231299a
 2020-03-12 09:55:28 +00:00
Automerger Merge Worker
999977ff27 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours am: b2a718f62f -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Iae2b16273c94c1cfefc3ba1cc377f796c45c4136
 2020-03-12 09:55:22 +00:00
Automerger Merge Worker
1b2cdfc1e0 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours am: 0922e7fdcb -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: Ic938d11f692384c04b04aac9ddbd643a0983529f
 2020-03-12 09:55:01 +00:00
Automerger Merge Worker
bde8ce85e0 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours am: 6708ebae6d 
Change-Id: I6a6e037cc80eb9f2cc505158e5f937b287c05254
 2020-03-12 09:54:13 +00:00
Automerger Merge Worker
4cc152835c [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c 
Change-Id: I7ece5a97e683dec786ba8c95a7950bc4b4b0d693
 2020-03-12 09:54:12 +00:00
Automerger Merge Worker
c90737a257 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: I572fec74b56a8e2e4e7f3ca9ecdc536a09a376bc
 2020-03-12 09:53:24 +00:00
shafik
143ec3ec2b Update ManageExternalStorageDetailsTest setUidMode 
We previously changed ManageExternalStorageDetails to use
AppOpsManager#setUidMode instead of AppOpsManager#setMode, but forgot to
update the relevant unittest. This CL changes that unittest.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=ManageExternalStorageDetailsTest
Fix: 150914062
Change-Id: I2cfe7e7a19f2422474d11fb946089a6847b36b12
 2020-03-12 09:43:55 +00:00
Automerger Merge Worker
b2a718f62f [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours 
am skip reason: subject contains skip directive

Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
 2020-03-12 09:23:29 +00:00
Automerger Merge Worker
0922e7fdcb [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibbf2edb55ba4f72cbb1d8c96ab266f841bf31f27
 2020-03-12 09:23:22 +00:00
Automerger Merge Worker
6708ebae6d [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 -s ours 
am skip reason: subject contains skip directive

Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
 2020-03-12 09:23:01 +00:00
Automerger Merge Worker
7dc37f978c [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours 
am skip reason: subject contains skip directive

Change-Id: I70c3e6daa2e2bbe6e2cef1fcbd1e78cd475fbc20
 2020-03-12 09:22:57 +00:00
Automerger Merge Worker
f816e89f7a [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia4397258a0b87af025c6d8a866c03a060555b462
 2020-03-12 09:21:48 +00:00
Bonian Chen
bfc8714e1f [Settings] Code refactor 
Code refactor.

Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
 2020-03-12 16:31:06 +08:00
Tim Peng
dd39f44344 Handle ransferring state in output switcher 
-Add subtitle on Slice item for transferring and failed case
-Add test cases

Bug: 150903460
Test: make -j50 RunSettingsRoboTests
Change-Id: I45fee20194dc6c9ec86ca88158393dfda455d0c0
 2020-03-12 16:29:30 +08:00
Bonian Chen
35904059d0 [Settings] Fix behavior of mobile data plan 
Fix UI issue.

Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
 2020-03-12 16:26:51 +08:00
Bonian Chen
a9d89cfd60 [Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION 
Add flag for startActivity() with URI.

Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
 2020-03-12 16:14:00 +08:00
Zhen Zhang
63c7c202d7 Log some actions for changing wifi hotspot config 
Log following actions:
- wifi hotspot name changed
- wifi hotspot password changed

Added tests for logging actions in each controller's test.

Bug: 151113705
Test: WifiTetherSSIDPrefereceControllerTest;
WifiTetherPasswordPreferenceControllerTest;
CodeInspectionTest

Change-Id: I84b1cd8449e575a6ee1ad8868e7791dc601e726f
 2020-03-12 01:06:46 -07:00
Automerger Merge Worker
85c9d1dd97 [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours am: 5a870aa5d5 -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55 is in history

Change-Id: I91e9aa2aee38c9a6a3a7cc69d2b68ea3ee2b3877
 2020-03-12 06:54:47 +00:00
Automerger Merge Worker
189116b4da Merge "[automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours" into rvc-d1-dev-plus-aosp 2020-03-12 06:54:30 +00:00
Automerger Merge Worker
236ef7c6bb [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7 is in history

Change-Id: Ieac11e3e2f9a269c221ef548a80f9c3a4f3218fc
 2020-03-12 06:54:25 +00:00
Automerger Merge Worker
57dee00e9c Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316 
Change-Id: I398b4c88516a2a8736cf48f788415a6651e23f0a
 2020-03-12 06:54:23 +00:00
Automerger Merge Worker
977a698823 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 
Change-Id: I87825756a6920e39019c5dce12d34afb57c1f02f
 2020-03-12 06:54:18 +00:00
Automerger Merge Worker
5a870aa5d5 [automerger skipped] Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7 is in history

Change-Id: Iffc859da54d2e3b16d3f291a4e90349eff3b3d5e
 2020-03-12 06:42:37 +00:00
Automerger Merge Worker
cae2447a56 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 
Change-Id: Ic3ec86390758853a91341650e1382215d04ea6d5
 2020-03-12 06:42:35 +00:00
Zoey Chen
e34dc697d2 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev 2020-03-12 06:40:04 +00:00
Automerger Merge Worker
c1059b0f25 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e 
Change-Id: Ibb0d255c96279db485f4190c98b5fc854826f8a7
 2020-03-12 06:39:18 +00:00
Automerger Merge Worker
a4fc50d316 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e 
Change-Id: If8c5007d7d1c2ca48420850acce74db358959f0f
 2020-03-12 06:38:34 +00:00
Calvin Pan
59f5eb638e Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev 2020-03-12 06:25:11 +00:00
Automerger Merge Worker
c7501141ba Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 
Change-Id: I2bcc38d576f22a10a9e49c60f7963797496423e7
 2020-03-12 06:18:24 +00:00
Automerger Merge Worker
141451127a Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp 2020-03-12 06:17:59 +00:00
Automerger Merge Worker
fe7cf5f899 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7 
Change-Id: I86d9bd3407b616621eebeb14f8980c9edc0fec1a
 2020-03-12 06:17:55 +00:00
Automerger Merge Worker
5ed8894807 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 
Change-Id: Ia3e222438b0716557f23bf6d2e39a2de9abe7cd9
 2020-03-12 06:17:51 +00:00
Automerger Merge Worker
d137a12391 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 
Change-Id: Ib117c57c211d00b8bff1efcef59e4f6eb789a794
 2020-03-12 06:17:36 +00:00
Automerger Merge Worker
4c69bcab70 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a 
Change-Id: I80f8b6a996ec4006a225f63d5471ae7f70a2bcb4
 2020-03-12 06:03:46 +00:00
Automerger Merge Worker
548e9e0370 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a 
Change-Id: I4ec3a3d4e082fb5f49de2aa1a48482e98afa9951
 2020-03-12 06:03:43 +00:00
Automerger Merge Worker
9e15dc3582 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb 
Change-Id: Ib6deaaca23af6c8636e2861a011ff02d982c507b
 2020-03-12 06:03:40 +00:00
Automerger Merge Worker
4636557ab7 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb 
Change-Id: Ifd71046d26c35b9bd400d1bc9a164e2210630280
 2020-03-12 06:03:23 +00:00
Menghan Li
873b50a46a Merge "Update R acessibility assets and strings (2/n)" into rvc-dev 2020-03-12 05:37:32 +00:00
Menghan Li
3fd654becb Merge "Update R acessibility assets and strings (1/n)" into rvc-dev 2020-03-12 05:37:19 +00:00
Tim Peng
e7bc985a35 Remove unnecessary permission for output switcher panel 
-Make this as a generic panel
-Add CTS to make sure this panel works on all Android devices

Bug: 151272095
Test: make -j50 RunSettingsRoboTests
Change-Id: Ie4fe277144a586eaf902dc5b700027153b1c86ab
 2020-03-12 05:13:26 +00:00
Automerger Merge Worker
65621e32a2 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 
Change-Id: Ie2914126f17d11c8115ae4d3c178a4c6259e71d5
 2020-03-12 05:06:47 +00:00
Automerger Merge Worker
9701a87b2d Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c 
Change-Id: I352a8e1ab7b7654f490d43d5291f60c68f9aa2e4
 2020-03-12 05:05:50 +00:00
Automerger Merge Worker
3cce160521 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c 
Change-Id: I345c9b8ccfcb801605066c2f0d14fe4b7a292d80
 2020-03-12 04:49:10 +00:00
Automerger Merge Worker
70f287362c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c 
Change-Id: I5f7a480c4dd5b035ad8e61e430d235dcd23c76e6
 2020-03-12 04:48:55 +00:00
TreeHugger Robot
40613ef30c Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev 2020-03-12 04:35:32 +00:00
zoey chen
cf33e51a55 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
Merged-In: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-12 03:56:46 +00:00
Automerger Merge Worker
aa62a717b5 Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: ee7f5bc540 
Change-Id: I18e7ba4726768df945913d906b47583dce9b1a3d
 2020-03-12 03:16:21 +00:00
Automerger Merge Worker
9bd2280297 Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814 am: 93fedb0e3f 
Change-Id: Ibb0a7616784160bbf2be0242bf42cd1125411ab8
 2020-03-12 03:15:53 +00:00