PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,676 Commits 1 Branch 0 Tags
7644d6002022f4754fc11f4deb1ca3776ffbf8cc
Commit Graph

121676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tom hsu
ef595a7915 Make all sim list by ordering with slot id 
Bug: 271975836
Test: Manual test
Change-Id: Ie568145a978548e4aa3ee80e06b2b75524f8853a
 2023-04-07 23:37:18 +08:00
Bill Yi
efc9c4ab6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2039a343cfc2c7ba6ee6409e2649bf0d7aed6f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 15:21:01 +00:00
Zaiyue Xue
581f3e8286 Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414532

Change-Id: I6cb6b20bce20f7758d200a6260975b8dfe62cbb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 13:54:06 +00:00
Zaiyue Xue
fbe85872b3 Merge "Refactor function to support slot size not must be two." into udc-dev 2023-04-07 13:09:11 +00:00
Zaiyue Xue
06b8092fdb Refactor function to support slot size not must be two. 
The function insertHourlyUsageDiffDataPerSlot() only supports the slot
has two-hour data now. This assumption is not neccessary. Refactor this
so in my next cl ag/22379150, the last-full-charge slot and now slot
could have only one-hour data.

Bug: 271214926
Test: manual
Change-Id: I57f7898ce1c92b8849baf9a44314455adf0098f4
 2023-04-07 19:49:52 +08:00
Jason Chiu
7fdfc9e519 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: Ie82241400edc90957a797425c1a4efaec05cb560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:25:58 +00:00
Jason Chiu
c239942dee [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I17774688cd6ca04a30541be3d65aa099dfd5d5b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 06:54:14 +00:00
Jason Chiu
1bd4b6e2ea [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours 
am skip reason: skipped by user chiujason

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

Change-Id: I5669aefc0320ecdc610c56e0aade5600b5a1c79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 06:26:10 +00:00
Bill Yi
a568dc677b Import translations. DO NOT MERGE ANYWHERE 
BUG:271250248

Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
 2023-04-06 20:54:16 -07:00
Jason Chiu
c3a4d10115 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours am: f98cfff495 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I17312ce979ea3a60bc4c1481e78ad8e3bc9c3116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:31:43 +00:00
Jason Chiu
f98cfff495 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours am: e5fa405609 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I08568549208788f413eeca7cda8214862f986da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:59:53 +00:00
Roshan Pius
6fc40046a3 settings(uwb): Show message when UWB is unavailable due to regulatory 
Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I8a6f01aba237234fe88e42ba338a1df02623f7da
 2023-04-06 11:34:15 -07:00
Roshan Pius
95892f3394 settings(uwb): Refactor UwbPreferenceController 
1. Use handler executor to directly handle state changed callbacks in
the same thread as APM handling.
2. Use the same flow to fetch the initial APM mode & UWB state from
onStart()
3. Store the state and reason code (to be used for showing regulatory
message in follow up CL).
4. Refactor the class for better unit testing (use mocks, avoid reaching
into class members being tested by using argument captor).

Bug: 270515435
Test: Manual tests
Test: atest UwbPreferenceControllerTest
Change-Id: I1b8c06a05691d9512de65ca2d61f3963dab230ab
 2023-04-06 11:34:08 -07:00
Jason Chiu
e5fa405609 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I4bafcdad13776f705b0a80380a06249bd88a424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:27:25 +00:00
Jason Chiu
f133736e6c [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:00:33 +00:00
Darrell Shi
9c42bf89fa Merge "Hide timeout to user0 pref when switching blocked." into udc-dev am: 7242e7bb86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22391043

Change-Id: I314b62d3617787495f1aef4c168afd40b68816f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:51:21 +00:00
Darrell Shi
7242e7bb86 Merge "Hide timeout to user0 pref when switching blocked." into udc-dev 2023-04-06 15:22:25 +00:00
Bill Yi
44f5246022 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours am: c364a011ec -s ours am: e0ac8c3aea -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: Ib7a97305565f1ed6f78a2dc6ff93676b0964f3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:46 +00:00
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