PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,282 Commits 1 Branch 0 Tags
c0e7328a88e2bc36d66eb655feaae252baeb18f8
Commit Graph

78282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
6e6d785c06 JUnit readme displays updated apk file location 
Test: N/A
Change-Id: I265319c726b5b5ca3e8273be0be61e1b9063e7d6
 2020-10-19 10:16:38 +00:00
Weng Su
2e49b2e639 Merge "Modify the privacy controller to be selectable in the next updateState()" 2020-10-19 09:51:23 +00:00
TreeHugger Robot
676db42f51 Merge "Add string for text of bluetooth switch" am: 868a15350a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12797033

Change-Id: I33be40196bf1a193024d758836640a35b2a2870c
 2020-10-19 09:29:47 +00:00
TreeHugger Robot
868a15350a Merge "Add string for text of bluetooth switch" 2020-10-19 09:19:42 +00:00
Jason Hsu
695c94c2e3 Merge "Set the minimum height to the CheckBox" am: 3a90feaa26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12797031

Change-Id: I3703501658d1337388212e962e8aafab10495992
 2020-10-19 07:53:05 +00:00
Jason Hsu
3a90feaa26 Merge "Set the minimum height to the CheckBox" 2020-10-19 07:28:54 +00:00
Jason Chiu
fb36be1a2f [Injection] Refine UI behavior for icon_uri 
1. Make the icon provided by the content provider override static icon.
2. Apply the background settings "bg.hint" and "bg.argb" to icon_uri.

Bug: 167568758
Test: visual, robotest
Change-Id: I44c66d8ea2686df1dfe1f9ad28645da7e21414ed
 2020-10-19 15:25:58 +08:00
Weng Su
f71149911b Modify the privacy controller to be selectable in the next updateState() 
Listen WifiEntry#onUpdated() to update preference states will be modify
in next CLs.

Bug: 170148009
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test
Change-Id: I5acf096970431a0b093dd7e0968f30c1959e3b7f
 2020-10-19 14:37:03 +08:00
TreeHugger Robot
1617f054b4 Merge "Fix output switcher will show 2 media session in some use cases" am: ccccc79043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12860495

Change-Id: I4336a3b25947defa926d0eaa59c4f2a8a99ddd4b
 2020-10-19 04:42:16 +00:00
TreeHugger Robot
ccccc79043 Merge "Fix output switcher will show 2 media session in some use cases" 2020-10-19 04:12:50 +00:00
TreeHugger Robot
37f8061594 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 42a891460e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863465

Change-Id: I674eeb6173ffbb45c457abb08cba3198df5ae307
 2020-10-17 22:36:51 +00:00
TreeHugger Robot
42a891460e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 22:22:51 +00:00
TreeHugger Robot
de444989b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cc8bc0cbc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12868210

Change-Id: If993dec1036fae73ca66e7f57efccec5b06bdbef
 2020-10-17 20:30:36 +00:00
Bill Yi
c701c7ec61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours am: 6b937e8542 -s ours am: d6efa21da7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863464

Change-Id: If1d63dcc47e4bd2bf208dac3f0e6b398bb1d6c2c
 2020-10-17 20:30:30 +00:00
TreeHugger Robot
1cc8bc0cbc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 20:02:06 +00:00
Bill Yi
d6efa21da7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours am: 6b937e8542 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863464

Change-Id: Id9702e915f1c597c817315080558d0af5bf6bca6
 2020-10-17 19:59:42 +00:00
Bill Yi
6b937e8542 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c58e9b1b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863464

Change-Id: I0f3a41cdb6eb7df80718d40acf93e18fdfc5cc02
 2020-10-17 19:47:21 +00:00
Bill Yi
75f213e982 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id409765908bccc30904d26ded670edfc84a535ed
 2020-10-17 12:46:22 +00:00
Bill Yi
be13719177 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id851db5d79ae223b802e053b8a3dd120c3fa4b20
 2020-10-17 12:10:53 +00:00
Bill Yi
e0c58e9b1b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ide6e88b9dfe1253577e04f8a0d664530db31842d
 2020-10-17 11:35:11 +00:00
Ilya Matyukhin
ad29b26539 Merge "Update generateChallenge/revokeChallenge w/ frameworks/base" am: 252a9595a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12851194

Change-Id: I42a3276fb098a0bb5bdbaf5dd1753dd5064e3bb3
 2020-10-17 00:13:17 +00:00
Ilya Matyukhin
252a9595a8 Merge "Update generateChallenge/revokeChallenge w/ frameworks/base" 2020-10-17 00:10:47 +00:00
Kevin Chyn
6c31f27d5a Merge "Fix biometric string" am: 0a270aba11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12863847

Change-Id: I9af1cf35ddf58cdc7ab25b57dbdf9c2a5d21c316
 2020-10-16 23:16:41 +00:00
TreeHugger Robot
3d1f383707 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 am: 09a906b972 am: 9c989442d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I766f85398f09a6ebd11f4cc8223cd61cbb60b7e0
 2020-10-16 23:16:20 +00:00
Kevin Chyn
0a270aba11 Merge "Fix biometric string" 2020-10-16 23:00:44 +00:00
TreeHugger Robot
9c989442d1 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 am: 09a906b972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I8101838915bb821e9ce6483ba2c7d21ad894a0e5
 2020-10-16 22:58:21 +00:00
Oscar Shu
9be7e466d4 Merge "Increase mac rand char limit for translation" am: f0d864ac5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12854080

Change-Id: I452273c8101b4f2b691ae421bb943b4bf04a7647
 2020-10-16 22:51:51 +00:00
TreeHugger Robot
09a906b972 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I0026c3fbb1bf26d68f203c36c49576deb6d79681
 2020-10-16 22:42:07 +00:00
Oscar Shu
f0d864ac5a Merge "Increase mac rand char limit for translation" 2020-10-16 22:30:44 +00:00
Yi Jiang
0bbc758197 Updates screen attention preference at onStart(). 
Screen attention preference needs to be refreshed at onStart() so that
it get updated immediately once the camera permission is revoked/granted
for the screen attention feature.

Bug: 171019472
Test: manual + atest AdaptiveSleepPreferenceControllerTest

Change-Id: If9ac68c022f10ffefde61b035bbf38ee14c02180
 2020-10-16 15:25:12 -07:00
TreeHugger Robot
1a09d244d4 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev 2020-10-16 22:18:33 +00:00
Kevin Chyn
3b6410c92b Fix biometric string 
Fixes: 169163181

Test: Builds
Change-Id: I8ae5cdc32957fa63849213fb04f10c8fb2e00211
 2020-10-16 12:47:30 -07:00
Amit Mahajan
ab342760ad Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d am: 0f36371e3e am: 45435fdb1d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Iafe645fb6907b7836400c6f7ea413a396bdff5e2
 2020-10-16 08:17:18 +00:00
Hugh Chen
3a7293cbbf Fix output switcher will show 2 media session in some use cases 
Before this CL, we didn't check whether the remote session existed
in the list before. If priority of remote session is higher than
local session, it causes us to return the local session even if
the list has a remote session.

This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
 2020-10-16 16:08:48 +08:00
Amit Mahajan
45435fdb1d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d am: 0f36371e3e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I8f902653e404ad89c09189b29469c9b599efcf05
 2020-10-16 08:04:11 +00:00
Amit Mahajan
0f36371e3e Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I282af7cad68106b706d6b6fa477d720797b74ad1
 2020-10-16 07:48:10 +00:00
Amit Mahajan
0e5fdb184d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
 2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
 2020-10-16 06:39:15 +00:00
Amit Mahajan
7b9edcde47 Merge "Add the extra "Ask every time" if supported only" 2020-10-16 06:21:34 +00:00
Kevin Chyn
af7837f602 Update generateChallenge/revokeChallenge w/ frameworks/base 
Bug: 171002801
Bug: 170517180
Test: Enroll on existing devices
Change-Id: I78530fde275c5ac924e50d77de43b90969d6eb5b
 2020-10-15 18:41:47 -07:00
xshu
1246f4c42c Increase mac rand char limit for translation 
Per request in b/170679746

Bug: 170679746
Test: compile
Change-Id: I909cbd3818ce126ab6341da26fd15961ec897ae9
 2020-10-15 15:55:17 -07:00
TreeHugger Robot
a38a53210c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 647666a50f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12844257

Change-Id: I0af8d2ef9816ae0530f46964b4be993eee646794
 2020-10-15 15:06:43 +00:00
TreeHugger Robot
647666a50f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-15 14:49:31 +00:00
Neil Fuller
8a339e82cd Merge "Adjust wording for auto time / time zone detection" am: 0b71d1ef94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792959

Change-Id: I53f533d6d541f55da29dc3652cdbdc575bf77ad7
 2020-10-15 12:40:21 +00:00
Neil Fuller
0b71d1ef94 Merge "Adjust wording for auto time / time zone detection" 2020-10-15 12:19:44 +00:00
TreeHugger Robot
7622548f28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 93070ad7dc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12843995

Change-Id: I09b6f1fd39447d65039c16741d7863f2644e49dd
 2020-10-15 07:36:50 +00:00
TreeHugger Robot
93070ad7dc Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-15 07:08:11 +00:00
TreeHugger Robot
63e54954c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours am: 572317ad54 -s ours am: de8ebd9b28 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12843506

Change-Id: I34c9a69be9f680cd145c545dd1dbe5c6ecaf09f9
 2020-10-15 05:43:27 +00:00
TreeHugger Robot
de8ebd9b28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours am: 572317ad54 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12843506

Change-Id: I450bcf8c5e96b3d6531921870795af4c5ee909da
 2020-10-15 05:21:01 +00:00
TreeHugger Robot
572317ad54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7ea9985044 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12843506

Change-Id: I974c00175f51aff80549aaf850f658bf95b69e00
 2020-10-15 04:26:23 +00:00