PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,972 Commits 1 Branch 0 Tags
68b0a1a765f05c97343d7cd58caccbf723fb3e45
Commit Graph

123972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
68b0a1a765 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I306e19d3503d7c5af19ac7abb845e805c91f24da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:41:39 +00:00
Treehugger Robot
9bd80164e2 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I722191069fb3273957f569354179ace9311e805f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:03:25 +00:00
Treehugger Robot
44c807906b Merge "Fix string" into udc-dev am: 81ac516705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I46eb103dc599e26b08d460e49c8fd673a4c1e749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:12 +00:00
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Hao Dong
09362ab430 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours am: f99b22505b -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: Ia23d8f6fdf72bb36ae0bfd52fde36d0b4be36146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:12:39 +00:00
Hao Dong
4172ed9816 [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 4762df7e21 -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I0cdef07f3901b531f78f50a4a25bd3fc55e5535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:08:09 +00:00
Hao Dong
119012dd06 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 am: 3d52ce0a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6825102c105e5e0c9a7302c9b696d44a885ad120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:03:44 +00:00
Hao Dong
f99b22505b [automerger skipped] Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 0ff2d2b2af -s ours 
am skip reason: Merged-In Ie4bc18bf245eb7a755862401c710d85381063ff9 with SHA-1 755a67a931 is already in history

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

Change-Id: I43bfbe506a4a65e3867c865ad028b6c8c8a3c97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:42:18 +00:00
Hao Dong
4762df7e21 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I8f0423bba882ed4d2ba3c84fb99dbb38aef0683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:41:24 +00:00
Hao Dong
3d52ce0a95 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I6436874a454da9870a6e872e67334a5432c77635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 18:39:04 +00:00
Hao Dong
51554eb9a1 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:57:59 +00:00
Hao Dong
0ff2d2b2af Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 17:54:13 +00:00
Becca Hughes
f7c4d9c903 Fix string 
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
 2023-05-11 17:45:30 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
Treehugger Robot
842e51e19d Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 90456a7140 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I1bef49554c966ec58026eacea7654023c03f75a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:21 +00:00
Treehugger Robot
ff7d516eec Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: 65ef6d0f2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I875b53a2d8fb092c5a1b8bf86f36ce1daf0bda95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:12:13 +00:00
TreeHugger Robot
e45f5fff74 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: 2f0c6e89a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Id8cd60c784e30b960dfa6e4b3db9675f8e6ffde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:11:37 +00:00
Treehugger Robot
98d872d0fb Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c am: 06661db1fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: If8c20aa74befdae56f87169c7a8decacd0c570a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:37 +00:00
Treehugger Robot
46d938dec9 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 am: 02237bf13d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I68211855e3ca0323120cb2e0565bf3b10aa415aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:30 +00:00
TreeHugger Robot
fe62fa5583 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 am: f178365e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I54577ef4b89af465349d679fb2b635bc0abd9726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:22 +00:00
Treehugger Robot
89ac7e108d Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb am: 3a788f845e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Icb2e2b017265008b4267440c6fd62bd539497009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:07:14 +00:00
Treehugger Robot
8b32e6f12f Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd am: ce0a356845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I17ddbe34bb2c9414e2efc33117ed449d40bd4d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:06:41 +00:00
TreeHugger Robot
72269bf6d4 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 am: c4ee326ee9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I83bee5495540f133c57d53b2a7dffac28d4b300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 16:06:01 +00:00
Treehugger Robot
90456a7140 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I75aafba2b90ce316476ae5f6f6603a1a8566fe53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:42 +00:00
Treehugger Robot
65ef6d0f2f Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I36817d0dfa5b91e10541569cbfa264720867e498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:34 +00:00
Treehugger Robot
06661db1fa Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: e2ff838b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I2da8d5d7ba24bca4e9aa253806606c4100dfd0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:11 +00:00
Treehugger Robot
02237bf13d Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 1fa9e9fac5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: I3dd0a9ec59cdbf5f21ef6780a4c205474fee614e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:30:03 +00:00
TreeHugger Robot
f178365e07 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: c639d6fd91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Icfe9b872290c8941e9f284e6d18c13071bbbc270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:29:44 +00:00
TreeHugger Robot
2f0c6e89a4 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Ibebf1635ffe9275e01f2b4d8a54648dfd877b1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:29:07 +00:00
Treehugger Robot
3a788f845e Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: Id4948f9511ce543ccad9256c20a58f9d4f9e9603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:45 +00:00
Treehugger Robot
ce0a356845 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Icf3daafbfbc03063ef2ff6474373e826e5b48590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:37 +00:00
Treehugger Robot
e2ff838b0c Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I2b2bbe36980949ff99d36f18013c2be2d3767e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:25:02 +00:00
TreeHugger Robot
c4ee326ee9 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: d1235d8e76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I49e1d3e8b32d7ead14abcf4bf3ee27b26cfec233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:24:58 +00:00
Treehugger Robot
9799b0bfdb Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I6ca26dce7454098b492e6016936c6091e89106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 15:07:08 +00:00
Treehugger Robot
59ec10b05a Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev 2023-05-11 14:52:04 +00:00
Treehugger Robot
0acfbaefbd Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Ia20f150e902d55ca403c1d2a5ff424f17e69cb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:48:46 +00:00
TreeHugger Robot
d1235d8e76 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I820b9037229c62403f275e5ab0ca35142f57c22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:48:25 +00:00
Treehugger Robot
1fa9e9fac5 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Ic40b7e453eab49009aa6be24f39fef3e4641c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:43:41 +00:00
TreeHugger Robot
c639d6fd91 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: I8065f98bd78eb7529427906611bccdc4c860cd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:42:25 +00:00
Treehugger Robot
643b51c42e Merge "[Settings] Remove redundant code." into udc-dev 2023-05-11 14:28:30 +00:00
Treehugger Robot
35f8f17484 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52414ae87d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I8f342fcd9991a7dd530f15659002bb1000a7f1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:26:00 +00:00
Jason Hsu
75b9499364 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: b9f0489c01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Icd7fb0e5cdc9599aa92e71b120b91fb6aa55382f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:25:51 +00:00
Treehugger Robot
8b3c2ea963 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a0c32784ea am: b86e027c88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I2325a3abafa665c56a25cdb0acedafadf4ba9956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:20:58 +00:00
Jason Hsu
f6dae369c5 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: db3a350e4d am: d7b99e5b12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: I518895b65b3eb52a010d47b08ff414c3da20adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:20:49 +00:00
Treehugger Robot
a500781d67 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f am: 52e2ee66ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: If6c5231df1d4e4c8c9b2511d0b612180a6c4f733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:20:38 +00:00
Jason Hsu
4f715ffa7a Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: 884bc10f9b am: 013fc5a1ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: If8e7ba3aa15256770069fe19b37bdd8df24b2b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 14:20:17 +00:00
TreeHugger Robot
c271732a85 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev 2023-05-11 14:01:25 +00:00
Treehugger Robot
b86e027c88 Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: a0c32784ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I9b16af70557443d118dfbbb05a5b67f31717e1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:43:54 +00:00
Jason Hsu
d7b99e5b12 Merge "Update hearing aids to hearing devices" into udc-dev am: f7f38b2d66 am: db3a350e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123003

Change-Id: Ied21dcde49a87a2a7ea13032be9708793f40969e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:43:46 +00:00
Treehugger Robot
52414ae87d Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I25f361e28b334ab7bc13d6604d92124e513b153e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 13:43:16 +00:00