PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,157 Commits 1 Branch 0 Tags
1f76047c99b07b124667da298f686461dc09474f
Commit Graph

124157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
52b723beef Revert "[Settings] Adjusting the control of display sequence (part 2)" 
This reverts commit 6b379cd7cf.

Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
 2023-04-22 08:47:20 +08:00
Bill Yi
51a04e12bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I627c552f8da0bc57708bffa767acfdb1f4fe9e12
 2023-04-21 17:25:02 -07:00
Bill Yi
71c7b5f54c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I747a6dd6b0d5c4b2d23e7334887745ec86c51c11
 2023-04-21 17:19:35 -07:00
Bill Yi
ca18853bab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
 2023-04-21 17:17:53 -07:00
Bill Yi
5c646d4394 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
 2023-04-21 17:16:56 -07:00
Bill Yi
fa5e1c57f8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ide3a650caf8d7a7d3a127d31be873d5eb3e067d9
 2023-04-21 17:15:06 -07:00
Bill Yi
960fa1521c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I686b72adb7baa39b1bf41d1a4e112530b0d773c6
 2023-04-21 17:13:18 -07:00
Xin Li
46a75de98a [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours am: 57c5a99b9f -s ours am: eb2cb56f9b -s ours am: 974f0f3762 -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: Ia4aa546cbb3144ee3ce2088389704260e9fbd37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:54:30 +00:00
Xin Li
c98eeb0825 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours am: b27298c4fe -s ours am: ce8657848c -s ours am: fe8a6baae3 -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I9bd5a7ff2b9433fbe124cf29bcba8e4ff41998a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:52:29 +00:00
Xin Li
974f0f3762 [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours am: 57c5a99b9f -s ours am: eb2cb56f9b -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: If38dfd0871f7cf5717c12806c0f76d580ea0f57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:14:42 +00:00
Xin Li
fe8a6baae3 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours am: b27298c4fe -s ours am: ce8657848c -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I4aa4bbfb486036d7ac61943b48310d49ca89b5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:11:50 +00:00
Xin Li
eb2cb56f9b [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours am: 57c5a99b9f -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I4127df037d90c6b9ac4c9a63a7cc02ff967abf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 22:36:27 +00:00
Xin Li
ce8657848c [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours am: b27298c4fe -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I28a18e0f9c9d0f394026476f10b620286a877786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 22:34:06 +00:00
Xin Li
57c5a99b9f [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:15:13 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Jagrut Desai
857adef229 Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 am: 2146420ddf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I1788c4d327ccc1bf233436da827ebbe3df337117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 17:39:28 +00:00
Jagrut Desai
5750a04d1a Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 am: 00906998af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I94b6f2bdf88678c2a2b69447a3b2a24d03f1fa62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 17:36:48 +00:00
Jagrut Desai
00906998af Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I8d8a79246658fd74fef0d536a750bd4cd6ae74f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 16:58:26 +00:00
Jagrut Desai
2146420ddf Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I52091f5f80e53ac7a2545a7fd7bde6a8db5b4976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 16:55:59 +00:00
Randy Pfohl
f572cc569e Ensure we launch gesture tutorial as new task 
test: built for two pane device and verified it opens full screen
bug: 278918583
Change-Id: Icee33cb4a931e3037eab8e0146eddca55a5fd09d
 2023-04-21 16:53:04 +00:00
Jagrut Desai
eea8283783 Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev 2023-04-21 16:16:31 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference 
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
 2023-04-21 23:08:06 +08:00
Automerger Merge Worker
8fd79cc038 Merge "Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: 92dbbe576e" 2023-04-21 10:38:41 +00:00
Philip Junker
e88780c9a2 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: 92dbbe576e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I71eecd6aab2759fc683cf269dad4b97efb0c60ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 10:37:55 +00:00
Philip Junker
9e34ccd80f Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: a9e09ac0ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I5d184e66b6581e5eeb6620ed0d17fc493384e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 10:37:38 +00:00
Philip Junker
a9e09ac0ce Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 10:20:25 +00:00
Philip Junker
92dbbe576e Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: Iebc8f31e8fac4bddee8687c124c56c3883784b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 10:20:24 +00:00
Philip Junker
134bea1957 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-21 10:07:47 +00:00
Bill Lin
563a6cfa47 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 am: cb8fea4125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I371d1ecc46da805667f77951d148e184611d62a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:35:52 +00:00
Bill Lin
ffe7901613 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 am: 73b4163534 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I289891a055dc36b7df2158de3ef0a12666c80a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:31:07 +00:00
Bill Lin
cb8fea4125 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I6fe18e9aba304628a45c48eb58e2b234053ff072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:13:08 +00:00
Bill Lin
73b4163534 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I99ec5143d6367180b2a33262b50b07724dbacc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:13:02 +00:00
Automerger Merge Worker
77cd3e4dba Merge changes from topic "am-d0afe5da0ab5418285b38d27ffa2f92d" 
* changes:
  [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours am: 1fc920d0cf -s ours
  [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours am: 157fe7c4b7 -s ours
 2023-04-21 08:12:42 +00:00
Piotr Wilczyński
b9c74127b5 [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours am: 1fc920d0cf -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: Ia247228af654d1f73e77d6c85d772c94683213ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:11:56 +00:00
Piotr Wilczyński
3ad5f33f08 [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 am: 55110e699e -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: I1c5b28081da4782ac5e97384acd8fd15da6e891b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:11:28 +00:00
Piotr Wilczyński
0207b007eb [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours am: 157fe7c4b7 -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: I258ddffd14f39e2662bf8b77e613d80e30700457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 08:11:09 +00:00
Piotr Wilczyński
55110e699e Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485

Change-Id: Ie2d6effc0447df1c0048df01f6be1c90f1d19a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:56:50 +00:00
Piotr Wilczyński
1fc920d0cf [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: Id32d9d31e5776e0d88c76ccde881fa337b1ad283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:56:31 +00:00
Piotr Wilczyński
157fe7c4b7 [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours 
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: I7b3e7d7d1d4096680a38656f18e29e2d86e83036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:56:28 +00:00
Bill Lin
a958fc79c8 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev 2023-04-21 07:35:55 +00:00
Piotr Wilczyński
85d5e3efb8 Merge "Back up the smooth display setting" into udc-dev 2023-04-21 07:31:47 +00:00
Automerger Merge Worker
5e5212839f Merge "Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4334ccb662" 2023-04-21 07:06:52 +00:00
Treehugger Robot
c356942122 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4f3e5c3a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: I9714b0bf6eec68e81e2ee1dba7df96d5aaa7db9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:06:10 +00:00
Treehugger Robot
8dc1c2600e Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d am: 4334ccb662 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: I6aeca930d43a9a20bd3acd1b24cab76e1b576376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 07:06:03 +00:00
Zaiyue Xue
aea4d365a6 Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started. 
Bug: 279120121
Fix: 279120121
Test: manual
Change-Id: Ie793266f8453a2902d7e16e5c58443a3c7bf55ef
 2023-04-21 14:43:10 +08:00
Treehugger Robot
4334ccb662 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Ib98306fe33abe1520124309d84c13580e0c57a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 06:28:02 +00:00
Treehugger Robot
4f3e5c3a67 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Id83eadb6177a8424a0a28d87633971f7fd58e858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 06:27:59 +00:00
Treehugger Robot
0c1838807d Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev 2023-04-21 05:57:43 +00:00
TreeHugger Robot
29ca96abbe Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 am: e7a1f12ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: I9d50709a44e16e4476ee19f7143561669e5d4def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 05:44:03 +00:00