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

121623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
a27d94d75d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I2c0b2bf9d57fbe518e14f2a9b30e3044be89011f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 19:38:02 +00:00
Hao Dong
22c608be4d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev 2023-04-10 18:58:27 +00:00
YK Hung
9dd71326dd Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If863d983c5f72cca4ae6a4c7c6afb47239f3be3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 14:41:50 +00:00
YK Hung
c429ca3e2f Merge "Add manual enabled battery saver reason (2/4)" into udc-dev 2023-04-10 14:03:33 +00:00
Daniel Huang
4e0371303b Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I27db019a7dbf1a237969a92969848d6ec13acd93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:38:04 +00:00
Treehugger Robot
8b3797727f Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I812e4a865730a1d45bde9ae9f500b990e0d0c6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:37:18 +00:00
Daniel Huang
3f16621b86 Merge "Touchpad settings' icons update" into udc-dev 2023-04-10 06:49:06 +00:00
Treehugger Robot
35f9d486a5 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev 2023-04-10 06:48:17 +00:00
danielwbhuang
eaa6a03d65 Touchpad settings' icons update 
Two icons need to be updated:
1. The touchpad speed setting inside of the touchpad settings
2. The bottom right tap setting inside of the touchpad settings

https://screenshot.googleplex.com/5QKLTwX8qNrnRsj.png
https://screenshot.googleplex.com/7iHNKwzwAZm5h8N.png

Bug: 269100659
Test: manual
Change-Id: I776e94325b1f54475f406a2fe11c4db4a0205f40
 2023-04-10 06:35:24 +00:00
Tom Hsu
09238601fa Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 04:39:34 +00:00
Tom Hsu
5240d251e1 Merge "Make all sim list by ordering with slot id" into udc-dev 2023-04-10 04:13:55 +00:00
Elliot Sisteron
996851e310 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ic26d725919b349c1959149b1229effac7ae2fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:26:31 +00:00
Elliot Sisteron
bc1ee1264b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev 2023-04-08 21:06:55 +00:00
Hao Dong
64277a23bb Show a dialog preventing face enrollment in split mode. 
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
face
Bug: 276938441

Change-Id: I45e859b453700aa79f7774fb5deda81b1f30e5a5
 2023-04-07 21:53:52 +00:00
Hao Dong
e7edbd3543 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I6ef587b0500534bbb3d050a9375abccba25cee5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 20:57:52 +00:00
Florian Mayer
ab14241e64 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: Ia4d95a05268432874a40cfe4f905d28c269b30ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 20:54:07 +00:00
Hao Dong
8930e6ea87 Merge "Update the limit of split screen dialog strings." into udc-dev 2023-04-07 20:43:39 +00:00
Florian Mayer
f58ea4671e Merge "Move bootloader_override property" into udc-dev 2023-04-07 20:06:25 +00:00
Hao Dong
9266101608 Update the limit of split screen dialog strings. 
Bug: 277359484
Test: N/A
Change-Id: I006fa2bb26a5d2702af4bd9b2914278934ec4b1f
 2023-04-07 19:25:11 +00:00
Florian Mayer
1ef1073694 Move bootloader_override property 
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
 2023-04-07 18:32:30 +00:00
Zoey Chen
5297f748e6 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Id20f9ad7e215e5860e71cae908b0eb2304cd8669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:29:53 +00:00
Zoey Chen
8cd0c5816c Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev 2023-04-07 17:57:28 +00:00
Zoey Chen
4800801661 [i18n] Use Framelayout instead of Nest scroll 
Bug: 274538667
Test: local test
Change-Id: I2a6917a639ac6ba987df425d8974f9d51487a41f
 2023-04-07 16:34:47 +00:00
Roshan Pius
5e7e88a4b6 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: Idbf64445aebae5cec752b7bb00f8c1ec29682947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:23:38 +00:00
Bill Yi
097ac7eec5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -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: If091fa7f4f8ce75772bd43407e2c84f44da05a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:23:14 +00:00
Roshan Pius
7a49bfe6b0 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev 
* changes:
  settings(uwb): Show message when UWB is unavailable due to regulatory
  settings(uwb): Refactor UwbPreferenceController
 2023-04-07 16:03:48 +00:00
Bill Yi
eff901c18e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -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: I3b1296e694c0cbec9b56fd451eac84106a10e273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 15:51:54 +00:00
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
4a6bdb2fc8 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: I40cf8f41ed2974860bd223efbce55ba30773436f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 13:54:15 +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
d21043eb92 [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: Ib585307dd26cab267240c892458314a54943b3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:26:09 +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
37ae274714 [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: I7e79c204ff00ace62d256a717f01f402753ff89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:31:48 +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
b3b0ec6811 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: If605fec99324b08bda168186285e9c33bd92cb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:51:35 +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
a40a0b2be9 [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: Ib1963ef9bc3f338b8ea0fc92943dd80b1e0b70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:13 +00:00
Bill Yi
9065c1f306 [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: I50c71e800ba65288a1d687b7581ee9c922b302e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:07 +00:00
Bill Yi
c6aadfbd61 [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: I6acaf0ff713a578e6df6388783e172b5232bb893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:55:56 +00:00
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
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
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