PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,553 Commits 1 Branch 0 Tags
c54584127b9843014ba181dc9487f44a263e181e
Commit Graph

119553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c54584127b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1 -s ours am: e617406b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I473165263d0379243128be343727764d2a5f1ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 08:22:38 +00:00
Bill Yi
1cddc22f0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe -s ours am: e1a54f8968 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22f0d36ecef77f57190853ad79f615fbaee4cd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 08:22:33 +00:00
TreeHugger Robot
e617406b8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb915ee324738c57efaf2e4e61f968d555f90b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 07:51:18 +00:00
Bill Yi
e1a54f8968 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dd5ec9eb1a9c88145ec78b296e4df736edf9b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 07:51:01 +00:00
TreeHugger Robot
4591a191e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-27 06:57:01 +00:00
Stefan Andonian
ec6fd4c353 Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddbc5 am: 98d219cd2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872948

Change-Id: Icd6904a71918a0c25a49fbbc6fff4ce06d6333d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 05:54:58 +00:00
Stefan Andonian
98d219cd2f Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddbc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872948

Change-Id: I9b0c01eee4861a1ca9e1ffb35bb54bb3e8cec473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 05:10:30 +00:00
Stefan Andonian
d0e6bddbc5 Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev 2023-01-27 04:38:04 +00:00
Bill Yi
f0104105fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6b9f9cd2b3f944107a5b980ae67bbca70eb1be93
 2023-01-26 18:01:59 -08:00
Prabal Singh
a9231555e4 Add "for work" in work profile biometrics string 
Bug: b/266415194
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
 2023-01-26 17:04:22 +00:00
TreeHugger Robot
abe1e8a329 Merge "Create MoreSecurtiyPrivacyFragment" 2023-01-26 16:06:13 +00:00
Prabal Singh
52ba133285 Create MoreSecurtiyPrivacyFragment 
Created a new MoreSecurityPrivacyFragment, a new
more_security_privacy_settings xml.
This more_security_privacy_settings xml is a created by merging
privacy_advanced_settings.xml and security_advanced_settings.xml and the
MoreSecurityPrivacyFragment is created by merging
PrivacyDashboardFragment and SecurityAdvancedSettings fragments.

Test: adb shell am start -a com.android.settings.security.MORE_SECURITY_PRIVACY_SETTINGS
Bug: b/261557620
Change-Id: I8729f4eaf25a31f91354383e7b6cb5e0fc7df976
 2023-01-26 14:43:00 +00:00
Diya Bera
b61c468b93 [automerger skipped] Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a am: 789071c86e -s ours 
am skip reason: Merged-In I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0 with SHA-1 1c2423f36b is already in history

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

Change-Id: I848b38469abd31c513775eff6ec6ffe2d0a7c841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-26 01:58:40 +00:00
Diya Bera
789071c86e Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev am: 9f1e35fe1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21089906

Change-Id: Ie0b1bdb3ab1fe0a28362d7529431f890905507f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-26 00:55:28 +00:00
Daniel Norman
da3e632b5a Merge "Includes AccessibilityMenu-in-System in interaction controls category." 2023-01-25 23:23:38 +00:00
Diya Bera
9f1e35fe1a Merge "Added string to encourage user to enroll more fingerprints" into tm-qpr-dev 2023-01-25 22:16:34 +00:00
Diya Bera
561e87932d Merge "Added string to encourage user to enroll more fingerprints" 2023-01-25 19:47:11 +00:00
Daniel Norman
590eefb55a [automerger skipped] Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352 am: 758951ae83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4592c8c18f8a8b04264fc81b019d3e7ed0793512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 19:32:29 +00:00
Daniel Norman
f1c6781e46 [automerger skipped] RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93 am: d443d32182 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80864f572fb1e8b1564605cf50b8024323ded4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 19:32:22 +00:00
Daniel Norman
758951ae83 Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692

Change-Id: Iee19672e20d6b8522f77a231dafee0791f2a9703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 18:41:19 +00:00
Daniel Norman
d443d32182 RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692

Change-Id: I7b1cf7c7f5f7c69d1a5b98e0210f8bb81027a08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 18:41:11 +00:00
Diya Bera
711f16ddd8 Added string to encourage user to enroll more fingerprints 
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475

Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
Merged-in: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
 2023-01-25 18:32:13 +00:00
Diya Bera
1c2423f36b Added string to encourage user to enroll more fingerprints 
Test: Manual - Finish enrolling a fingerprint and check the message
displayed
Bug: 265023475

Change-Id: I77a6bd08a5bfb58971539bf4d366d0425ae0c9a0
 2023-01-25 18:04:38 +00:00
Daniel Norman
f6e3be8352 Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev 2023-01-25 17:44:40 +00:00
TreeHugger Robot
43eb9f8fc9 Merge "Add strings for active unlock in settings" 2023-01-25 09:29:40 +00:00
Derek Jedral
2221964344 Add strings for active unlock in settings 
Add strings that active unlock needs to consume when surfacing itself in
combined biometrics settings.

Test: none, strings aren't consumed yet.
Bug: 266583888
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
 2023-01-25 08:07:10 +00:00
Tyler Freeman
78d943e9d1 chore(magnification): update assets for tablets am: fe7f4fe5ad am: bb8f8d9a59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107

Change-Id: I27cbaefe4f5f204cc1037eb223c1f375ba374122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 04:36:32 +00:00
Tyler Freeman
bb8f8d9a59 chore(magnification): update assets for tablets am: fe7f4fe5ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107

Change-Id: I80e9657132e0dad2b8c6550bb2273f948d8cffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 03:46:59 +00:00
TreeHugger Robot
fd4be32732 Merge "Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time" 2023-01-25 03:45:12 +00:00
Treehugger Robot
d7ef82078c Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95 am: 1d7192e9f6 am: 5ebb151415 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I3ee36a6414a03a41227c79815ef96b8b825c8a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 03:27:18 +00:00
Treehugger Robot
5ebb151415 Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95 am: 1d7192e9f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I8a73e24c88fcbecc35ea77ef79a253790a77f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 02:58:33 +00:00
Treehugger Robot
1d7192e9f6 Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 02:15:02 +00:00
Treehugger Robot
5f27701d95 Merge "Fix NullPointerException when renaming a fingerprint" 2023-01-25 01:39:07 +00:00
Daniel Norman
322fc449af Includes AccessibilityMenu-in-System in interaction controls category. 
The Menu APK will be included by default on devices. However, in order
to ensure Menu appears in the interaction controls category an OEM would
need to update their config_preinstalled_interaction_control_services
array.

This change ensures Menu is in the correct category without any OEM
action required.

Bug: 261252772
Test: atest AccessibilitySettingsTest
Change-Id: I9b3d6dddf2691d9489ef847e400eb776aca96e56
 2023-01-24 16:59:24 -08:00
Ilya Matyukhin
67d47f6b4a Fix NullPointerException when renaming a fingerprint 
(Original change made by xingbin.feng@sony.com)

Fix NullPointerException when rotating the screen while renaming
a registered fingerprint

Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash

Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
 2023-01-24 23:55:29 +00:00
Florian Mayer
a3484fe4a4 Merge "[MTE] Move toggle to dev options" 2023-01-24 23:44:57 +00:00
TreeHugger Robot
2478e8ee83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d3054dcb94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23323412b3453c128f0d83123119a5cbbeec57ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-24 19:28:55 +00:00
Tyler Freeman
fe7f4fe5ad chore(magnification): update assets for tablets 
Fix: 261547655
Fix: 243902461

Test: launch cf_x86_64_tablet, open Settings > Accessibility
Test: Open "Magnification", check banner animation
Test: Open "Magnification" > "Magnifcation Type", check images
Test: Perform the above with both light and dark mode.
Change-Id: I93fa93b32790de207edfd34fe95f416802a5dfee
 2023-01-24 19:19:29 +00:00
TreeHugger Robot
84f0b132c0 Merge changes from topic "tc_change_23012315_21" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b8993eea7
  Import translations. DO NOT MERGE ANYWHERE
 2023-01-24 18:38:09 +00:00
TreeHugger Robot
d3054dcb94 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-01-24 18:38:09 +00:00
TreeHugger Robot
4e561b0c79 Merge changes from topic "tc_change_23012315_21" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 61fe780a99
  Import translations. DO NOT MERGE ANYWHERE
 2023-01-24 18:38:09 +00:00
Zaiyue Xue
f622ebf269 Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time 
Bug: 265364490
Fix: 265364490
Test: manual
Change-Id: I380277674817bcc047d9d298cb889859048254b7
 2023-01-24 23:12:47 +08:00
Bill Yi
2ab5f687a1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-24 14:08:09 +00:00
Bill Yi
8876d02f96 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-24 14:08:09 +00:00
Bill Yi
f63d75a1a0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-24 14:08:09 +00:00
Zoey Chen
7f8d96648c Merge "[Settings] Do not insert subInfo repeatedly" 2023-01-24 13:16:12 +00:00
TreeHugger Robot
4f368ebe06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b6eeb6c975 -s ours am: ce23f7b591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic23e50ec919f41dc798cdc90ce87cc53fd0626ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-24 05:15:11 +00:00
Bill Yi
c7101c5498 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b50b32ff1 -s ours am: bdc9a968e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98b77fb88cb1c70ca852ca6595466e096ebd1eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-24 05:15:08 +00:00
TreeHugger Robot
1937e416d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: da8b6c7cbb -s ours am: 67a186b189 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b1dd791d3f0cd41c6729528b21c7d787d41137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-24 05:15:07 +00:00
Bill Yi
34cd13214e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe2b12b076 -s ours am: c31821fdb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9f3bdb91ed4d0f807fac669587f8815d98f60f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-24 05:15:04 +00:00