PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,419 Commits 1 Branch 0 Tags
00ac6a4e584f59b97dacfcef93fdd4682bcdbf50
Commit Graph

123419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
4fa89a904e [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: I694e7fa20f4dfd02431a026525123baa39b14a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:24 +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
b66e96ad2b 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: I535c7b1cdab0a502d2f9f07d48076b7ac7f60711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:37:30 +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
SongFerng Wang
39c0fb400a Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev am: 803fe08dc5 am: f592262592 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22508562

Change-Id: Ia473ce345c2f7a41efed31130ba94ead36fddd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:11:32 +00:00
Automerger Merge Worker
0a1a7b2476 Merge "Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev am: 56c16c247f am: 38a06ba0ad" 2023-04-06 14:09:13 +00:00
SongFerng Wang
d99deafd0e Merge "Unregister MobileNetworkRepository during onPause()" into udc-dev am: 803fe08dc5 am: ac73ff9de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22508562

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

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

Change-Id: I726d9773827a7cce9528d2a0a95cb4e8ce1bd08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:06:21 +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
ac73ff9de6 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: I0c729e2619ce5b6d45c55ee8c873728154e902ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:39:15 +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
f731e8a685 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: I9cde3e5bc2486c38035672003d5505b6731c7f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:37:04 +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
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