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

60041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d782d88e5e [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: 99eedee50f -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I2cd4d12721f2965adcc0aaf6c5ee9d9a7422692c
 2020-03-12 16:19:10 +00:00
Automerger Merge Worker
c79de6aa02 [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 am: 751daad079 
Change-Id: I72cbb0bc62253b0c18f40f5ef2b1a9ed30f4815a
 2020-03-12 16:18:45 +00:00
Automerger Merge Worker
5d79efa587 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c am: da93669044 
Change-Id: Ica43af29af88dc47eebc007421bad3ea7ccff31f
 2020-03-12 16:18:43 +00:00
Automerger Merge Worker
55f5ffbd04 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours am: f816e89f7a -s ours am: 08aec12201 -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: Ibe77fbfeaa783ddcc740f614ee570a071288c721
 2020-03-12 16:14:43 +00:00
Automerger Merge Worker
99eedee50f [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: Iee76dec583df021474f5dee13eb1b2085b126bb7
 2020-03-12 16:02:22 +00:00
Automerger Merge Worker
751daad079 [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: Idef6515e39b51e3a03cac2daaa8a8f790c85a87e
 2020-03-12 16:01:42 +00:00
Automerger Merge Worker
da93669044 [automerger skipped] RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee -s ours am: 7dc37f978c 
Change-Id: Id580a25bcf5f69aa555dd0fed9087527c36fcedf
 2020-03-12 16:01:40 +00:00
Automerger Merge Worker
08aec12201 [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: I01ba5349a4fef2ebf12a4e3d579e57f5e1e3b7fc
 2020-03-12 16:00:46 +00:00
Automerger Merge Worker
eae9ffda6a Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 am: 6714c01dd6 
Change-Id: Ifbc48adf4e12ff4b9fe3c009c04e7fd4f9312b83
 2020-03-12 11:42:14 +00:00
Automerger Merge Worker
b39c97b7e8 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2 
Change-Id: I557166bb0dc59de8660395c5dbbce8ad5430ed0b
 2020-03-12 11:41:58 +00:00
Automerger Merge Worker
6714c01dd6 Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72
 2020-03-12 11:31:41 +00:00
Automerger Merge Worker
a7c8f74cb2 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 
Change-Id: Iec491d3c73c041e0c828a3c90575f3f3dd7d99ab
 2020-03-12 11:31:30 +00:00
Automerger Merge Worker
a99bfeadf9 Merge "[Settings] Code refactor" am: a7a9863a52 
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
 2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
 2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52 Merge "[Settings] Code refactor" 2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" 2020-03-12 11:06:51 +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
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
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
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