PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,244 Commits 1 Branch 0 Tags
eeaa6e4eaf116bbac951e89fa59f5adef8e8409a
Commit Graph

75244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
eeaa6e4eaf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If13f8df62726ec63be5165fa8c8ee55d24c958c4
 2020-10-22 09:38:52 +00:00
Treehugger Robot
bde04e31cd [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours am: f2f13ca90a -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: Iaafef64fa7464e64ecc985ccdeb2632745f68990
 2020-10-20 21:08:05 +00:00
Treehugger Robot
f2f13ca90a [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: I3886e4ba36d6361c60f65e28cde49fc7dd83cd1f
 2020-10-20 20:18:23 +00:00
Treehugger Robot
9d867703c5 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: Ie60eb5b5524b59ab0f8b2aa4079c08a685b02577
 2020-10-20 19:34:05 +00:00
Treehugger Robot
bda0c67436 [automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours 
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history

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

Change-Id: I70a4a5ebc491947ec7d9205d54301eb5dc28f4b9
 2020-10-20 19:03:54 +00:00
TreeHugger Robot
58a2df3eae Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-20 15:48:56 +00:00
Bill Yi
13afb7d70d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e41e1a5d4 -s ours am: 1300825559 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b1e907f8e193d55f6962a0fa6a7ef4618b8797a
 2020-10-20 15:32:33 +00:00
Bill Yi
1300825559 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e41e1a5d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5148aa870c196f4dc41af2fd397db38ca6a03fe9
 2020-10-20 15:26:42 +00:00
Bill Yi
8995e8b9e9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I60fe8a4ec1b33665a298365ac74d7622825d3ba7
 2020-10-20 06:19:23 -07:00
Bill Yi
0e41e1a5d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28e7c337cac0995e72c01cb8349febbbe1abaf72
 2020-10-20 04:45:30 -07:00
TreeHugger Robot
886fe1e6ab Merge "Revert "Modify the privacy controller to be selectable in the next updateState()"" 2020-10-20 03:20:36 +00:00
Jeremy Goldman
c52961b5b9 Merge "JUnit readme displays updated apk file location" 2020-10-20 02:48:23 +00:00
Weng Su
67f95bfd2f Revert "Modify the privacy controller to be selectable in the next updateState()" 
This reverts commit f71149911b.

Reason for revert: Some unexpected code mixed in this CL.

Change-Id: I43574314554a9c62559f529e45f69c29ba6b5a77
 2020-10-20 02:12:28 +00:00
Treehugger Robot
7881b23f1f Merge "Merge redfin/bramble support." 2020-10-19 23:20:09 +00:00
Xin Li
5734fefefa Merge redfin/bramble support. 
Bug: 171218636
Merged-In: I600c63a996b1684a2b801787d88974501062c073
Change-Id: I2d54882d98577db7f5c2a70281d626a726adf947
 2020-10-19 10:08:23 -07:00
Yi Jiang
ac76152a6b Merge "Updates screen attention preference at onStart()." 2020-10-19 16:43:21 +00:00
Andrei-Valentin Onea
786d3578d1 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3 am: acfad23908 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I2eef4a833d3305a13aad13477fb46cf40ecd3068
 2020-10-19 15:53:58 +00:00
Andrei-Valentin Onea
acfad23908 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2
 2020-10-19 15:26:01 +00:00
Andrei-Valentin Onea
8e111e3de3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
 2020-10-19 14:56:40 +00:00
Jason Chiu
2d047a1e2f Merge "[Injection] Refine UI behavior for icon_uri" 2020-10-19 14:50:20 +00:00
Andrei-Valentin Onea
38747f76f3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073
 2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba Merge "Add support for @EnabledSince compat changes" 2020-10-19 14:19:31 +00:00
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
868a15350a Merge "Add string for text of bluetooth switch" 2020-10-19 09:19:42 +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
ccccc79043 Merge "Fix output switcher will show 2 media session in some use cases" 2020-10-19 04:12:50 +00:00
TreeHugger Robot
42a891460e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-17 22:22:51 +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
252a9595a8 Merge "Update generateChallenge/revokeChallenge w/ frameworks/base" 2020-10-17 00:10:47 +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
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
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