PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,443 Commits 1 Branch 0 Tags
1194c093960f157986dbaadbcf6f688cb2451a0f
Commit Graph

127443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1194c09396 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: a4f2a82d44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I047c57ed74bb390d8f8613ca94a948877b4638e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:02:26 +00:00
Bill Yi
8695b7f2fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours am: ef607acf40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6499598a26e7026aaf3d0c63d9635a6c58a72591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:02:04 +00:00
Bill Yi
d704d74ed9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: 72295da2e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fbdc8ded00fb5c0178b3e8692d485f591288d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:58:03 +00:00
Automerger Merge Worker
8d18c44b4f Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0 -s ours
 2023-07-14 20:56:42 +00:00
Automerger Merge Worker
7a561f02d5 Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I2cecedafa4cadeb6d0b14a1df802dfc00793dab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:29 +00:00
Bill Yi
4bd8c55370 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: 4249011ef2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If63f6a02d81c97c0e3e2bd144ccdace9493ffe8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:12 +00:00
Bill Yi
734ddee1de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I478b0aaa6d46e0e6d5231a0375293d2647272b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:03 +00:00
Bill Yi
8acb814c0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06369143cdc186b47a637fce5defbe5817bdcd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:53:32 +00:00
Automerger Merge Worker
919797970e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours" into udc-qpr-dev-plus-aosp 2023-07-14 20:44:48 +00:00
Bill Yi
94d5c18859 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d429258bb7c7aaaf9685639719290a6cd8e674f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:44:18 +00:00
Bill Yi
324f9dc0ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: 797d51f7cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8894595ba7cc713a983f8e3e302f85ae555adb43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:44:03 +00:00
Bill Yi
7c58a2edb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours am: c69e38797c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0606ba057c19cdd679dec79e18f451420cf40765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:42:01 +00:00
Bill Yi
05aa8c0efd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: a5dc181d3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2cf0d94c5aeb1e76a002921295d7cf468b99155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:41:04 +00:00
Bill Yi
72295da2e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7140c802963ae5cb7f8382303c5d702200c20ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:32:40 +00:00
Automerger Merge Worker
b273d4ce5e Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours
 2023-07-14 20:25:12 +00:00
Bill Yi
a4f2a82d44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia34f8055827477f57475c867a8dad186d4b29d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:24:51 +00:00
Bill Yi
ef607acf40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd1cbf66e2b67a449ab5cd6c967bb90a4d27fb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:24:32 +00:00
Bill Yi
4249011ef2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If23cd1ab963a5d74cab71d68cca7651a4c23e90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:23:00 +00:00
Bill Yi
25fabc93a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787ce23bfb1ed4a90590dbbc2c49d898dea16080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:22:49 +00:00
Bill Yi
c92c6e34c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc82f6a2eec8f46c13fc78c1437ac43d1e9bacfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:22:39 +00:00
Bill Yi
c69e38797c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16f112e03059f2b5baeac6193dd0df51260e4827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:17:24 +00:00
Bill Yi
208c74fa3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0076063f02d3590ccfb5f3ee2f6cc605d60b6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:58:36 +00:00
Bill Yi
2531d5736b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-14 19:57:27 +00:00
Bill Yi
1e86da303c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0890d4e15c37c5f22cfe1a5c72bfa46d1e6512d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:57:10 +00:00
Bill Yi
80172630a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-07-14 19:56:04 +00:00
Bill Yi
797d51f7cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ca5a27e7529091f53433b4195f9ef6c74906d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:55:21 +00:00
Bill Yi
a5dc181d3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I256036c7c7001598553dbfc71110de9316ef4437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:53:14 +00:00
Bill Yi
f74197dd3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76ada29d9bf6a54fb64e16c35fba28c1200c8461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:32:45 +00:00
Bill Yi
0cc5a16f95 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icaf934d95d7072cbd9e4163c592f62efe523a3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 19:32:22 +00:00
Bill Yi
9785c80168 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61ee6c3d5277ec175c863db02356fdad27ce0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 18:48:32 +00:00
Bill Yi
1ff28d9c1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2de227d48fb0409fb88f5b4dac8eb2c42482edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 18:45:03 +00:00
Shivangi Dubey
32d914ea56 Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963

Change-Id: I1bd342d5e2649e13734aa504f461bf12a141c819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 14:22:00 +00:00
Shivangi Dubey
8c68b0e7e2 Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev 2023-07-14 13:35:55 +00:00
Xinyi Mao
a5e2586018 Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev am: 6c12390bab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24037114

Change-Id: Ia9abd00ab92335a2752b053e06861e2cedcf0b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 07:07:56 +00:00
Xinyi Mao
6c12390bab Merge "Add 25% and 75% lines to improve the readability of the battery level as a short-term fix." into udc-qpr-dev 2023-07-14 06:31:30 +00:00
mxyyiyi
881d625b25 Add 25% and 75% lines to improve the readability of the battery level as a short-term fix. 
[Screenshot]
Before: https://screenshot.googleplex.com/5WDToTZsRcosbjC
After:  https://screenshot.googleplex.com/C4XJ4Mnigxa27gq

Bug: 260498797
Fix: 260498797
Test: Manual
Change-Id: I08c8ec3b2868c59d341ce34d93b6e010e3440cf5
 2023-07-14 13:51:56 +08:00
Treehugger Robot
486451e9cf Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev am: b544871b38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002332

Change-Id: I67b7e296e56e50c9745ca36e5994f06663ccb56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 05:14:04 +00:00
Chun-Wei Wang
4fbf549bdf Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806

Change-Id: Iea86a42398e88a5ef39fd26c7cac566f78b67017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 05:12:40 +00:00
Treehugger Robot
b544871b38 Merge "Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest" into udc-qpr-dev 2023-07-14 04:29:02 +00:00
Bill Yi
3f21bb3ba0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1d4a3c3a0dcb4669918482a2b0022f1eedd37f75
 2023-07-13 21:22:04 -07:00
Chun-Wei Wang
a671c3014e Merge "Re-enable most tests" into udc-qpr-dev 2023-07-14 03:52:01 +00:00
Peiyong Lin
7da022c74c Merge "Add warning on enabling ANGLE." into udc-qpr-dev am: e8e302b551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24041836

Change-Id: I4055ff6b3712b7c9029555b3259ce888ca40f976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 01:45:39 +00:00
Peiyong Lin
e8e302b551 Merge "Add warning on enabling ANGLE." into udc-qpr-dev 2023-07-14 00:28:03 +00:00
Bill Yi
eec083c169 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
 2023-07-13 17:14:07 -07:00
Bill Yi
2764a59fac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77ce443619168d050a0da92c30f51199b412566d
 2023-07-13 17:12:30 -07:00
Bill Yi
3d999ce533 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
 2023-07-13 17:06:52 -07:00
Bill Lin
f0278e6835 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896224

Change-Id: Ia5ee770bc367d6dc30610dbdc4582d343a28df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 00:01:30 +00:00
Bill Lin
8ea74c3d76 Merge "Update screen lock and biometrics options in order" into udc-qpr-dev 2023-07-13 23:18:19 +00:00
Chun-Wei Wang
203906516e Re-enable most tests 
Most tests are still successful. We don't want to impact
too much test coverage by disabling all tests.

Bug: 291146670
Test: atest ChooseLockPasswordTest --rerun-until-failure 50
Change-Id: Ia8266dc5d44ea9271a28e1bee80c3855b3c2d52b
 2023-07-13 23:14:38 +00:00
Treehugger Robot
7faa1585e7 Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main am: 24db817a65 am: 70b29d5f28 am: ec8e7816f3 am: 28ac723a78 am: d47f3a29ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2597316

Change-Id: I93a5e747f801c38480dc5c4bc377327dc190ac8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:41:56 +00:00