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

124547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
40d95455c0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

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

Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:59:03 +00:00
Treehugger Robot
e7d695f07a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:56:48 +00:00
Treehugger Robot
a785e266a1 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ibfde1d3da58ef0a954dc39502d8c6258f5150795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:46 +00:00
Bill Yi
e35c4affd7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44eb539eef07d75771be0e10c871e64a2323fe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 19:54:39 +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
Fangqiu Su
0a3a5b74a1 Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" 2023-05-11 19:50:53 +00:00
Treehugger Robot
a5af82be11 Merge changes from topic "tc_change_2305100725_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-11 19:28:21 +00:00
Treehugger Robot
b570c10767 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-11 19:28:21 +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
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch 
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
 2023-05-11 17:59:21 +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
cddf296c82 Hide description text view if there is overlap. 
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.

Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
 2023-05-11 17:34:07 +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
tom hsu
5e2862f2e3 [Settings] Avoid to unregister wrong observer 
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
 2023-05-12 01:10:19 +08: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