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

60612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
678a137916 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 am: a7c8f74cb2 am: b39c97b7e8 
Change-Id: I6e4e895b166609126b63106d5efa1a63db1213ec
 2020-03-12 12:03:54 +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
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
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
39d12019e4 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" 2020-03-12 11:06:51 +00: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
373caf5ddb [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 am: 779aa123c7 am: 3e46f0e167 -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55 is in history

Change-Id: I1e5c24ca83f3e77868aa439a7a44a47f2ceb8093
 2020-03-12 07:32:49 +00:00
Automerger Merge Worker
aeda53e535 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56 am: bad44347d5 
Change-Id: I46ea4ab65f975962028bea4042e0ec340d7c35e4
 2020-03-12 07:32:16 +00:00
Automerger Merge Worker
3e46f0e167 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 am: 779aa123c7 
Change-Id: Ia671f444da9ce999aa5a02022f38bbaf6ce033ab
 2020-03-12 07:11:00 +00:00
Automerger Merge Worker
3574af3fa1 [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: 85c9d1dd97 -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 cf33e51a55 is in history

Change-Id: I2a9f288a0df83c355c8b8d43390120c3468f7294
 2020-03-12 07:10:48 +00:00
Automerger Merge Worker
521e3cde98 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 am: 189116b4da -s ours 
am skip reason: Change-Id Ifc54090da6737d31a2eb71eeabe6846592ff32fc with SHA-1 3bfbb818c7 is in history

Change-Id: Ic8635e173a69680dd3f51ef482e7bf292574f5c8
 2020-03-12 07:10:42 +00:00
Automerger Merge Worker
bad44347d5 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: c25ebdfb56 
Change-Id: I144180075010cdce57933d3d5917dfba2aa66119
 2020-03-12 07:10:06 +00:00
Automerger Merge Worker
b8821ea3a5 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: a4fc50d316 am: 57dee00e9c 
Change-Id: I4409045cf67050612ce502f3107d96e25da165c6
 2020-03-12 07:09:53 +00:00
Automerger Merge Worker
ab91b6fc7d Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 am: 977a698823 
Change-Id: I298f7c11b041c90716a27437a571537d156d5839
 2020-03-12 07:09:31 +00:00
Automerger Merge Worker
779aa123c7 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" into rvc-dev am: e34dc697d2 am: cae2447a56 
Change-Id: I56bbe357b424ade4ce76ba892575c3363bf06c97
 2020-03-12 06:55:22 +00:00
Automerger Merge Worker
c25ebdfb56 Merge "Hide the 5G opiton when 5G has been disallowed" into rvc-dev am: 59f5eb638e am: c1059b0f25 
Change-Id: Ia15ff888a6672e952120888f6348e9b3323540ae
 2020-03-12 06:55:03 +00: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
da23843848 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173 am: b6abc73483 
Change-Id: Ica7aab5739e6c1e72001fe787ceeb1c5eb7993cb
 2020-03-12 06:43:02 +00:00
Automerger Merge Worker
05ce582a97 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 am: ec663b1e15 
Change-Id: I12d1035dac37228b921c7b863f857a11ec4a4fe8
 2020-03-12 06:42:51 +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
Automerger Merge Worker
051bf1bd58 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 548e9e0370 am: c7501141ba 
Change-Id: I7cb9630b99be9891ad9994d708cb479e6b8e8eb1
 2020-03-12 06:31:48 +00:00
Automerger Merge Worker
441b50a0f2 Merge "Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 4636557ab7" into rvc-d1-dev-plus-aosp am: 141451127a 
Change-Id: Ie62d2806d00cbf9ac374f4b0f9e90a0048d0e30d
 2020-03-12 06:31:43 +00:00
Automerger Merge Worker
b6abc73483 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 9c46665173 
Change-Id: Iaf9a5af1afd3b0289a0754d310915f024aee01c9
 2020-03-12 06:31:29 +00:00
Automerger Merge Worker
e5be54a8f4 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 
Change-Id: I9fa93764a09a4f216db6cb3507c20e6c12c14d25
 2020-03-12 06:31:28 +00:00
Automerger Merge Worker
ec663b1e15 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: 51b2592d11 
Change-Id: If6d818c6770910614b63ce502f2a4d506c0f98f2
 2020-03-12 06:30:55 +00:00
Automerger Merge Worker
81f18805dd Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 am: d137a12391 
Change-Id: I1e08ca603df32db2d67eab07dd252792e77aaea9
 2020-03-12 06:30:54 +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
9c46665173 Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 
Change-Id: I68a43988057229deae3a5b4c9daff400b6b5393e
 2020-03-12 06:18:16 +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
51b2592d11 Merge "Update R acessibility assets and strings (1/n)" into rvc-dev am: 3fd654becb am: 9e15dc3582 
Change-Id: I7f4cab8841a2be25a59de419fc9a7bf5039312fc
 2020-03-12 06:17:55 +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
Automerger Merge Worker
48b6e13a2f Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 70f287362c am: aa16276bbe am: ac24351d2a 
Change-Id: I0070b75ceade1d9607df4b051ffbca2bed756b73
 2020-03-12 05:41:26 +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
22e733f301 Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c am: 3cce160521 am: 65621e32a2 
Change-Id: I5901de77bbc04c876ea6aff2226635923eb2c780
 2020-03-12 05:20:35 +00:00