PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,099 Commits 1 Branch 0 Tags
2153e884b51f42f1ddd9d390d7775134c44b2960
Commit Graph

123099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliot Sisteron
a6bd172d0b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibfb4d9b634b655fa7b41290dd3dac13ecd3a0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:54:06 +00:00
Elliot Sisteron
1b14767540 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: Ib50b4fb7f91dabab3f947b8481e91430d5472076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:26:36 +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
0100948ac8 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: 1599bc7b91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

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

Change-Id: Idc3104355448c0b67e5a25719fc6ad58240354f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:37:26 +00:00
Hao Dong
be28cf536f Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: e7edbd3543 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

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

Change-Id: I8c841b5198babacd18ca85c581992ff89e3600a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:25:50 +00:00
Hao Dong
1599bc7b91 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: I0ec50ae9cb9fe08639ad870d0fd6681466f8edc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:12:43 +00:00
Florian Mayer
e405f55e32 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: I6d40815fcc55d6e5d7aa2587b98e6dbcef77f9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:09:29 +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
Zoey Chen
3717b67997 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 5297f748e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: I64f08a5756883797ac204524fcd08e84aff2497e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:08:32 +00:00
Zoey Chen
d15fe76759 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 39baaf4353 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Ib8fabdd09235d300299853300bf7068f68dcc14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:06:16 +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
39baaf4353 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: Ifc17093b61cd4dd83e1a4713050c82d4daf8cb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:26:08 +00:00
Pfohl
b094ed8e7d adding new animation to be used when gesture tutorial package is available 
test: built and verified animation shows up and is clickable to gesture tutorial menu on handheld devices

bug:248342586
Change-Id: I29a68accf67c4efc6b94058c2702f106edfec0a8
 2023-04-07 18:20:15 +00:00
Zoey Chen
8cd0c5816c Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev 2023-04-07 17:57:28 +00:00
Roshan Pius
580df886d3 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 01149077d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: I228f5180779e4a3c658717e4d92c0310cadeac56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:53:16 +00:00
Automerger Merge Worker
c8de63a8d5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 9aca022858 -s ours" 2023-04-07 16:52:54 +00:00
Roshan Pius
21f0ad2839 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 5e7e88a4b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: I43d03ef8235cfd1ebc2495b6148c97ad2958e92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:52:03 +00:00
Bill Yi
6287f186f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 097ac7eec5 -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: I537b9695762051f039cff1dda08e3de253ff7c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:51:49 +00:00
Bill Yi
9f3091af70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 9aca022858 -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: I60acaea7ac0852c8a11e9736d72486a0d0055328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:51:19 +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
Roshan Pius
01149077d4 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: Ia7d055877bd8553dbb858b4d83900cd481dcbfff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:23:33 +00:00
Bill Yi
9aca022858 [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: Ib432f09dcfcb21d65e74969506fa9be4331910f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:23:23 +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
Automerger Merge Worker
6bf140567c Merge "Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 am: 4a6bdb2fc8" 2023-04-07 14:21:55 +00:00
Zaiyue Xue
65d4989d96 Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 am: 4a6bdb2fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414532

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

Change-Id: I8b3205e91381b33782a041414dbcb79042951a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 14:21:43 +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
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
f638bfedb6 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours am: d21043eb92 -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: I312e5e9bd25c66357895bdce7f19b255a0757ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:56:31 +00:00
Jason Chiu
807bd8c158 [automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655 -s ours am: 1bd4b6e2ea -s ours am: c239942dee -s ours am: 7fdfc9e519 -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: I0a961afc1c3161d104c9e4ec2d978ddd1c053f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 07:56:22 +00: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
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