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

62902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
2f01748123 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 0f89b27f0b 
Change-Id: Ib0034e3e91473577ed479b200506a348ee39d17b
 2020-03-30 07:36:37 +00:00
tim peng
0f89b27f0b Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e 
Change-Id: I92dfa774bc4d4d969fe7980c7c7bed6e65d822f3
 2020-03-30 07:17:29 +00:00
tim peng
58baac0cbd Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 
Change-Id: Ie5c4012e64d59ca64288228a6ff4d83b91fef34e
 2020-03-30 07:06:55 +00:00
tim peng
15ac2b2c8e Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 
Change-Id: I24db3f5f2be14d1a63bef9327a828d93b3f50263
 2020-03-30 07:06:11 +00:00
tim peng
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +00:00
Robert Luo
2f4ebf9475 Refine NFC payment wording for "Set default" and "Update" scenarios. 
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I4d7591882489d3892020f8fa2f963f7c90ec79e4
 2020-03-30 13:25:39 +08:00
Bonian Chen
7fe5ab1aea [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: 712c3aa944 
Change-Id: I54c5101e79545c761e9689794a257a7d63581230
 2020-03-30 04:54:27 +00:00
Bonian Chen
712c3aa944 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 
Change-Id: Ia43ed326efb5e652bc66fb057987362543b3777d
 2020-03-30 04:40:43 +00:00
Bonian Chen
9c4d1190d9 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 
Change-Id: Ia5b8007cd0dc6b201493a1b88f277a1c10500bbb
 2020-03-30 04:25:20 +00:00
Bonian Chen
89e418e12f [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 
Change-Id: I5423d09d50bf76947e41927f9138e7db34f963a7
 2020-03-30 04:23:47 +00:00
Tim Peng
e4ccbbec67 PendingIntent in MediaOutputIndicatorSlice could be Hijacked 
-Add setPackage() to prevent local information disclosure

Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
 2020-03-30 03:53:02 +00:00
tim peng
18d42df80b Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 
Change-Id: Icd2d7142c994ebbd7ce67ee17119c36bc140a29e
 2020-03-30 03:45:33 +00:00
Remi NGUYEN VAN
57fbcec933 [automerger skipped] Merge "Adjust code for API council feedback" am: aab7aca759 am: 85f97bf02a -s ours 
am skip reason: Change-Id I5ff389f3f707e5538979830c2252455bea5bbb88 with SHA-1 e0b336d7a4 is in history

Change-Id: Ifefcbf2672b32a405be4ff6a59f280f8e90b7aa8
 2020-03-30 03:40:28 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform() 
Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
 2020-03-30 03:34:01 +00:00
tim peng
d5bdc55390 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c 
Change-Id: I91a8a9965fda5026b5d5dacc9a91e8149db8c557
 2020-03-30 03:31:55 +00:00
tim peng
668e370bbd Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 
Change-Id: I9a361f1a4c3157666237829408244c908a230ca7
 2020-03-30 03:14:50 +00:00
tim peng
3e73d0f92c Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 
Change-Id: Ic593ca5ddc1774b7b6895fee106dba8c595ff8a0
 2020-03-30 03:14:35 +00:00
Remi NGUYEN VAN
85f97bf02a Merge "Adjust code for API council feedback" am: aab7aca759 
Change-Id: Idd49347f191f75bbe05b45fcfa47856d87c983bb
 2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
aab7aca759 Merge "Adjust code for API council feedback" 2020-03-30 02:58:45 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Artur Satayev
36e377a475 Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea am: 3054fd601f 
Change-Id: Ic0fd6a10e88f8e16240b54ab8e1ed3f61510e692
 2020-03-29 18:56:01 +00:00
Artur Satayev
3054fd601f Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 am: f4ddb539ea 
Change-Id: I627ff295a03dd26e29b613711d4bde6ab22c7298
 2020-03-29 18:45:56 +00:00
Artur Satayev
e21aa8f776 Do not exlicitly declare dependency on changeid processor. am: 772243ca06 am: a14ed2a8ac 
Change-Id: Ib2bb4ae21901047a2b5de2b2d45433c28c1f29d4
 2020-03-29 18:34:09 +00:00
Artur Satayev
f4ddb539ea Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 
Change-Id: Ia152eba38febb9ae5f7321de77a1b5d198d9cf74
 2020-03-29 18:22:34 +00:00
Artur Satayev
a14ed2a8ac Do not exlicitly declare dependency on changeid processor. am: 772243ca06 
Change-Id: I367517c904a8bcb97df844af9c8f06c9870e198f
 2020-03-29 18:22:20 +00:00
Artur Satayev
44b344abc1 [automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 -s ours 
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 772243ca06 is in history

Change-Id: Id9da9d74dc0af42e6521dfebb4a6e9a2d71d95cf
 2020-03-29 18:22:19 +00:00
Artur Satayev
836dcbaf91 Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev 2020-03-29 18:07:37 +00:00
Artur Satayev
f9cc52d670 Do not exlicitly declare dependency on changeid processor. 
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
 2020-03-28 16:34:10 +00:00
Artur Satayev
772243ca06 Do not exlicitly declare dependency on changeid processor. 
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
 2020-03-28 16:30:47 +00:00
Kevin Chyn
01768d4879 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: dd0a4963c6 am: ee255b5cda 
Change-Id: I5c2d15f9aa15d98c0d37e07f0b3b26e40aefc3be
 2020-03-28 00:44:50 +00:00
Kevin Chyn
237ec41549 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 36359c9e96 am: 38c724f4f8 
Change-Id: Ibd3303efd001a2887f2b842bebc8b5af6e1832b0
 2020-03-28 00:22:19 +00:00
Kevin Chyn
72b0b96ef3 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: ef02804952 
Change-Id: Ibb71067cb3fc6d288ff4be8e307809e9df953956
 2020-03-28 00:21:25 +00:00
Kevin Chyn
ee255b5cda Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 am: dd0a4963c6 
Change-Id: I9c651f34a14a3fef87a6599c2ab3be9fd6053321
 2020-03-28 00:20:19 +00:00
Kevin Chyn
38c724f4f8 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 36359c9e96 
Change-Id: Iadea914ac19e929d4020142736bb0dc959d824f0
 2020-03-28 00:19:26 +00:00
Kevin Chyn
36359c9e96 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f 
Change-Id: Ib1da534f9cdd0e1f9a1739b9be9d7669f1ec3ca6
 2020-03-28 00:12:30 +00:00
Kevin Chyn
dd0a4963c6 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 
Change-Id: I30a3a73d57f8619b488ca4488fce34d076e14a11
 2020-03-28 00:07:04 +00:00
Kevin Chyn
ef02804952 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7 
Change-Id: I4d0fd4de66f85adc86829b4b63dbaa19e5c52e02
 2020-03-28 00:07:04 +00:00
Kevin Chyn
87723f3db7 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f 
Change-Id: Ic3aeaa4cfdee235a0cd5448d8cb2b31fe47f14cc
 2020-03-28 00:06:44 +00:00
Kevin Chyn
ef28e9b75f Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev 2020-03-28 00:06:00 +00:00
Curtis Belmonte
8ce5e23d1f Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: 082137fb5a am: 8c649f1aaa 
Change-Id: I138c2310c25239ce13d3a96a80c97c8c7b197aad
 2020-03-27 23:28:40 +00:00
Curtis Belmonte
7000591ad8 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde am: 1e510e6ac1 
Change-Id: I2f5ff5b56f747f1f0ad39346ab8dd11d4ea4a29a
 2020-03-27 23:22:04 +00:00
Curtis Belmonte
aef57e3522 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: c68465f024 
Change-Id: I9f396f2a651a8a589fd2104e3bbdb70b3d018a74
 2020-03-27 23:17:39 +00:00
Curtis Belmonte
8c649f1aaa Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: 082137fb5a 
Change-Id: I4d27021826a377d4460fab95392e72c364b88bae
 2020-03-27 23:13:45 +00:00
Curtis Belmonte
1e510e6ac1 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde 
Change-Id: I5acfdaf6398efb09a0813c8b30ad98bb62badaa2
 2020-03-27 23:02:04 +00:00
Curtis Belmonte
082137fb5a Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f 
Change-Id: I991a6c351ac621b3e9c52e74864d27e56433961f
 2020-03-27 22:56:07 +00:00
Curtis Belmonte
c68465f024 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f 
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
 2020-03-27 22:55:51 +00:00
Curtis Belmonte
6654372fde Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 
Change-Id: Ifa42922dfc21fadf3ff3dbdc32e6f4314f5846cb
 2020-03-27 22:48:07 +00:00
Curtis Belmonte
33851b108f Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 
Change-Id: Ia6c51e1c80bdf988c3a24f4268ef2130ee549f5b
 2020-03-27 22:47:17 +00:00
Curtis Belmonte
da4f9f7c27 Merge "Set CDC detail string as subtitle, not description" into rvc-dev 2020-03-27 22:42:22 +00:00
Julia Reynolds
eabc1904a7 Remove items from the 'last 24 hours' history on swipe 
And make it resiliant to duplicate data from the backend.

Test: manual
Fixes: 148956400
Change-Id: I650c89242c257df1ec34b2879f544d9a5211019a
 2020-03-27 17:13:22 -04:00