PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,015 Commits 1 Branch 0 Tags
adc0b398d6931ab4dad267130aad7f21de221f1c
Commit Graph

124015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
03954aa591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours am: f0a5a877f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69edea874ce1a97753efdf6d590703306b029f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:44 +00:00
Bill Yi
0f4054f1ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours am: 7c2ebdf095 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4505f9678f91bf69f2257058ac094d963e789b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:42 +00:00
Bill Yi
4579cbd02e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours am: 21e2a17443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62c86bb70c470fbd877ec902ed82d7a7b2f3e014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:53:39 +00:00
TreeHugger Robot
f5bc5d2968 Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e am: 1863ec03b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: Iae495e3afd7e44cfe2d068b3532a080abd66e110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:37:05 +00:00
Bill Yi
e0ac8c3aea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63ea81451ff0241ace1c2e8954392ad5c4a7b18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:33 +00:00
Bill Yi
f0a5a877f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours am: 10c1798572 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I609fb4f3846f8bd88d5bf25e6b73d257e0302083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:26 +00:00
Bill Yi
7c2ebdf095 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours am: 410e8ac5af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec272fb51d48ca3d75fee55f17daf02d255852bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:26:12 +00:00
Bill Yi
21e2a17443 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours am: 21c40c2ef4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982bc7a7e5e27c07bd9a60b6fee1a605bf105195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:25:53 +00:00
TreeHugger Robot
1863ec03b6 Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c am: 33affdae8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: I6abdcb94a4ac17ed1754b3e6b33b38a69de88735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:06:56 +00:00
Bill Yi
c364a011ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ec869f9ecf61f60d077179fdee7b2af99e140a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:39 +00:00
Bill Yi
10c1798572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b53f6aa0858a2a054c342e6eb2e89db7279c544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:30 +00:00
Bill Yi
410e8ac5af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icee3c3aa8fb3126890e0de521bb202c1173c1455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:28 +00:00
Bill Yi
21c40c2ef4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec465b7a3f13deb9c75eaa04999801210e027335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:57:29 +00:00
Elliot Sisteron
bc3d8daabb Change the label of CombinedBiometricProfileSettingsActivity. 
To contain "for work" as well.

Bug: 277198922
Test: manual
Change-Id: Icd39f633a00007d6dfa93df11ba2472fb283a747
 2023-04-06 13:51:00 +00:00
Bill Yi
aca33b33aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
Bill Yi
3cc4247a1a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
SongFerng Wang
f592262592 Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev am: 803fe08dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22508562

Change-Id: If6fe3e95d26f19c31640e2bd37111a76e27d90db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:37:48 +00:00
TreeHugger Robot
38a06ba0ad Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev am: 56c16c247f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22472426

Change-Id: Ie57ef891c5c25d5f16a092f66c267e5c4c33d5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:37:01 +00:00
TreeHugger Robot
33affdae8e Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:35:23 +00:00
SongFerng Wang
803fe08dc5 Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev 2023-04-06 13:24:36 +00:00
TreeHugger Robot
cb00b2bd0c Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev 2023-04-06 13:07:13 +00:00
TreeHugger Robot
56c16c247f Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev 2023-04-06 13:05:52 +00:00
Zaiyue Xue
c616a65144 Fix b/276423111: Keep unchanged perferences in the app list instead of clear all. 
Bug: 276423111
Bug: 269203672
Fix: 276423111
Fix: 269203672
Test: manual
Change-Id: Ie2cb668ae4c46f5c40eed555510be034be45d713
 2023-04-06 19:54:40 +08:00
SongFerngWang
fd531d6a07 Unregister MobileNetworkRepository during onPause() 
- Move MobileNetworkRepository unregistration from onDestory() to onPause() for corresponding to its registration by onResume.

Bug: 275456375
Test: built pass and verified in bug
Change-Id: I4cd2f23501485d4f3cfcf867cdb8d81e0385794a
 2023-04-06 11:50:04 +00:00
TreeHugger Robot
c01148716b Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508

Change-Id: If1d7df48930c24564e97826d27c2e6982a9d270e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 11:11:51 +00:00
TreeHugger Robot
7a1d2177d8 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev 2023-04-06 10:49:32 +00:00
Jason Chiu
5d50556ce2 [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906

Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 10:21:27 +00:00
Wesley Wang
c01d92982d Add manual enabled battery saver reason (2/4) 
Bug: 218405966
Test: make SettingsRoboTests
Change-Id: Ifd51cde5abbbd731c24bf677ca1c525ffd6993a3
 2023-04-06 17:11:23 +08:00
TreeHugger Robot
4b13cfc0f8 Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339271

Change-Id: I1f3f0a388d985cc7a40e49940128196e1ff21a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:39:55 +00:00
TreeHugger Robot
b29aa72fae Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev 2023-04-06 07:31:30 +00:00
Daniel Huang
9bbc2099ec Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I6b53e58b678d864a40610115cd356dbe7074d03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:25:05 +00:00
Daniel Huang
5f3e365c41 Merge "Handling multiple profiles for PK layout selection" into udc-dev 2023-04-06 06:52:18 +00:00
Milton Wu
4140b84881 [BiometricsV2] Fix 2nd touch not work for enroll 
Use MessageDisplayController only when enroll reason is ENROLL_ENROLL
and R.bool.enrollment_message_display_controller_flag is true.
And always allocate a new MessageDisplayController for each new enroll
to avoid the possibility of events being ignored by
MessageDisplayController.

Bug: 275510856
Test: atest FingerprintEnrollProgressViewModelTest
Test: manually test sfps/udfps enrollment for biometricsV2
Change-Id: Ifc8b91916a3d76bed68dc523a90dc6ba422e3923
 2023-04-06 13:18:41 +08:00
Jason Chiu
0f13f70655 Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 04:23:01 +00:00
Jason Chiu
9c39398d7a [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: I71fad690a350ce0372c63c00136d699a9980552f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:53:14 +00:00
Jason Chiu
b286a740ff [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: Ibd08062eda8fed1d32aeb7fb06faa907ae13ff7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:22:25 +00:00
Jason Chiu
2e82189b1a Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366

Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 02:51:54 +00:00
Jason Chiu
d0b0aeb2ba Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev 2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 02:22:45 +00:00
Bill Yi
a5ef604de7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibda77f75cc4865437dd8dc5f52260b62b9d6f00b
 2023-04-05 18:05:09 -07:00
Bill Yi
37114bb2b0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b1f4ec2b736b8123de1ee218b367083163d737e
 2023-04-05 18:03:09 -07:00
danielwbhuang
2659074d02 Handling multiple profiles for PK layout selection 
1. Use new @hide IMM#getEnabledInputMethodSubtypeListAsUser()
2. Use ProfileSelectFragment

Demo: https://screencast.googleplex.com/cast/NjMzNTA2NTA2NDczNDcyMHwxNTUyMjQ1ZS03YQ

Bug: 275106096
Test: manual
Change-Id: I51cfd16fc7162e2b24782017b9366b0aad36f915
 2023-04-06 00:50:54 +00:00
TreeHugger Robot
e4c7e5b424 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ic9f27eb0e6eba63b719edcb31a0cc54909d4fd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 00:37:40 +00:00
TreeHugger Robot
b232ba29e6 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev 2023-04-06 00:01:47 +00:00
Ben Lin
72534295d3 Do isAvailable() checks when accessing AirplaneEnabler. 
This instance is only initialized if isAvailable() returns true in the
first place, so we should check for it everytime we try to access it, or
else we will result in a NPE.

Bug: 271223463
Test: atest AirplaneModePreferenceControllerTest
Change-Id: I43d35b91c86517201c8ec4f458f8c0328a9fb768
 2023-04-05 22:34:16 +00:00
Brian Lee
95178742b3 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: I58487aef2bc252448119e48c7a2f2bedc3a710b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:35:29 +00:00
TreeHugger Robot
f58610ebe7 Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: Ifc78cbcbd8e4d3658a1dd028777b2103653304fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:59:46 +00:00
Vania Januar
1194f74dbd Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I00c5fdfe6f32fe91badad161719a373ee7b59f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:56:46 +00:00
Prabal Singh
a53a89d370 Add "for work" in work profile biometrics string 
JUSTIFICATION: Around 8 users reporting this issue in b/271250248
RISK: This change is a cherrypick from a fix already made in Android U where no issue has been reported after a few months.
Bug: 271250248
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
(cherry picked from commit a9231555e4)
 2023-04-05 17:16:22 +00:00
Lucas Dupin
99ddb6079c Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7e1fa01abd22b653ff1f1b1267c189cc09480100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:12:21 +00:00