PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,546 Commits 1 Branch 0 Tags
57a077f8a56c52cb7e3f1694c53365a0cf7ef63c
Commit Graph

123546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
f2fec322e4 Merge "Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 am: f14236300a" 2023-04-06 11:40:39 +00:00
TreeHugger Robot
f4da7e1cf5 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 am: c01148716b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508

Change-Id: I8c2af9d23fe6f71f620653f5d7d08a7940596e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 11:37:55 +00:00
TreeHugger Robot
21a52b69b1 Merge "settings(nfc): Remove reference to APM setting in NFC page" into udc-dev am: 7a1d2177d8 am: f14236300a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339508

Change-Id: Ibdb08e1016d57ca0c5853645598de520cefdd0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 11:37:51 +00:00
TreeHugger Robot
f14236300a 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: Ib482c7680cd8642540c8cb504277b060d6bedbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 11:11:55 +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
Automerger Merge Worker
c9d52b04dd Merge "Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae am: 4b13cfc0f8" 2023-04-06 07:53:50 +00:00
TreeHugger Robot
f7eee08e46 Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae am: 4b13cfc0f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339271

Change-Id: Ib08d0a2f376b48878251f7e3c15df5a74cb00dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:45 +00:00
TreeHugger Robot
5f2a7887dc Merge "[BiometricsV2] Fix 2nd touch not work for enroll" into udc-dev am: b29aa72fae am: f567072a69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339271

Change-Id: Id1d58bddc0fc017fbea27d1af894645664010add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:44 +00:00
Daniel Huang
b1582f79ce Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 am: 717f21edad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: Ib905addab50be021c62d7645655a44336baa6138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:34 +00:00
Daniel Huang
80dba035d9 Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 am: 9bbc2099ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I37e316d9cc483a33bb915449a27315bb3726dd9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:25 +00:00
TreeHugger Robot
f567072a69 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: I220d1a18f5fff52261212abfc8013c690c7cf705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:41:01 +00: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
717f21edad 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: I26b6df67c06480c6a4b5745cf8d92b90d8016721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:22:36 +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
Automerger Merge Worker
8996b725d4 Merge "[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: 9c39398d7a -s ours" 2023-04-06 04:20:45 +00:00
Jason Chiu
f33fdc4586 [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: 9c39398d7a -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: Ib34e3700c176375677ab79167a723d359b4db940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 04:19:23 +00:00
Jason Chiu
5027240a87 [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: 91ebc0d97c -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: I9b173e135b19cad8bbde88f7d1929cd2a4e1d043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 04:19:14 +00:00
Jason Chiu
91ebc0d97c [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: Ib0e4a3cb905e7a62750a75eb1f5f21d76c2a9b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:53:36 +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
Automerger Merge Worker
3cee20dd5a Merge "Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: 22a94c2b0e" 2023-04-06 01:07:19 +00:00
TreeHugger Robot
c1cdb4ae69 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: e4c7e5b424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ib543f8bce09153d65c0b21861a42c58b4d100385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 01:07:07 +00:00
TreeHugger Robot
bfa3775046 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: 22a94c2b0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: I381e3e8fc5205cb1e4a758782dc2d3697c4180ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 01:06:21 +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
22a94c2b0e 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: Ie63ee4c774bd4af9c58f9af0caface1b4fd1481c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 00:37:49 +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
a2cacc7f27 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 am: e1fa9effbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: I628c26b2e97e56e924d86049d82f1027554615e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:21:18 +00:00
Brian Lee
bd0b938ea6 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 am: 95178742b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: Ib733e78ec419e9b4f36b7c8a49a0ffa37104025e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:15:02 +00:00
Brian Lee
e1fa9effbc 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: I38ebb1bb199f6c9859d247a28c44ccb5868ccffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:48:38 +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