PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,101 Commits 1 Branch 0 Tags
b42d46fed5629326faa5521561c76e104b2413cc
Commit Graph

132101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Mikhail
c156b6c427 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev 
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
 2023-06-30 12:56:45 +00:00
Treehugger Robot
55e6446579 Merge "Clean up Kotlin FeatureFactory.getFactory(context)" 2023-06-30 12:46:54 +00:00
Treehugger Robot
90325d87cb Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 am: 063ba027f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Idbedec3b88650b6a64c944bc6d62d2c1124dbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 08:15:39 +00:00
Treehugger Robot
063ba027f7 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 07:34:05 +00:00
Treehugger Robot
369a1097c8 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev 2023-06-30 06:55:47 +00:00
tom hsu
0b3da89a91 [Settings] Fix inactive SIM show display name with subectiption id. 
- Cached active SIM' display name with last 4 digits phone number to
   avoid that this active SIM change to inactive SIM then show the
   display name with subscription id.

Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
 2023-06-30 05:51:40 +00:00
Zoey Chen
1ff6971261 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 am: 63a3e0056a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

Change-Id: Ieb756a5b380202e50bf1b3988eb277d671d7c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:46:25 +00:00
Zoey Chen
29a9e2c3c2 [Panlingual] Change the metric's string in Languages am: 6358f613cf am: 35920cd80f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863

Change-Id: I8f6f0e0c2553ffe213f9694983eab58c69358928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:45:24 +00:00
Zoey Chen
63a3e0056a Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev am: 3a7c5d9fa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840845

Change-Id: I3d080a3a007ebd0e379d193e6ae60efd853ffa35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:02:33 +00:00
Zoey Chen
35920cd80f [Panlingual] Change the metric's string in Languages am: 6358f613cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863

Change-Id: I1c657933cad5e0d7fc20d7ce323cf9045e8fdb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 05:02:21 +00:00
Zoey Chen
3a7c5d9fa1 Merge "[Regional Preference] Add content descripiton to the img for Talkback" into udc-qpr-dev 2023-06-30 04:18:16 +00:00
Quang Anh Luong
36d71f8785 Check P2P channel before requesting network info 
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.

Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
 2023-06-30 12:21:30 +09:00
Zoey Chen
6358f613cf [Panlingual] Change the metric's string in Languages 
Bug: 279915462
Test: manual
Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554
 2023-06-30 02:59:10 +00:00
Hao Dong
8791bfced8 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours am: 81edf4d6f1 -s ours am: 38f7beae49 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I52c3c1cf860a5f9acb58350ba10598b2b7e9181e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:29:29 +00:00
Hao Dong
ead5fdc72a [automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours am: d69fbd1daa -s ours am: 07f6bede3e -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I80d8108ce789b7655faa548858d0ef2c13edb192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:29:26 +00:00
Hao Dong
0cce5cd85c [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e -s ours am: 83e4a8a32d -s ours am: 180742fd49 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: I8e48d47b88c271333ad2a6761c80f28795ba8f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:29:03 +00:00
Hao Dong
8d26d3e3ee [automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c -s ours am: e0aa02b138 -s ours am: 84f8ea7113 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: Ia0c2cda8ba268e0c1700ffb7f8cd08286fcf2ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:28:59 +00:00
Automerger Merge Worker
565cb042cf Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp am: e4b8bdcead -s ours am: 902b39c57d -s ours am: b08f0ff404 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history

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

Change-Id: I2069ecb7347555c19c74cf778717f7a709d2ff7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:28:03 +00:00
Matías Hernández
95eaff804e [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: a2c213f4f6 -s ours am: d5d0ba64cd -s ours am: 599217999a -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: I14382c43d45b58339f83c69e9aa9e323ebc0451a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:28:00 +00:00
Matías Hernández
6572f1bdbd [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours am: 97062b969e -s ours am: 721c4098e8 -s ours am: 58ef7bf643 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Ib2962337c5f2a88ae59c2d87504b9c5d1f5b142a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:25:50 +00:00
Hao Dong
de16413b61 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 am: b911186928 -s ours am: dc21a409fe -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I18d204dbaefe766ef61253641f003783c1b54d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:25:38 +00:00
Hao Dong
d9fc3746c6 [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e am: 55ec9b88d6 -s ours am: 4a594a2b97 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: If39370d23ea1f91d2a4ecd80fcb04a9f05726609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:25:24 +00:00
Matías Hernández
b6c7e6cdb5 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: e943c371a8 -s ours am: 63e9f8671f -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: I1692f0c13d1f0022d093905c737adcd852e1e56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:23:56 +00:00
Matías Hernández
7612f6ad78 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: ba88ece9fb -s ours am: 9d181abd9f -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Ia07b269b9d7de72108ab113e03de18bb403cb2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 01:21:30 +00:00
Hao Dong
38f7beae49 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours am: 81edf4d6f1 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I0236a5520778f69fd0eff6a9c8a8564fe1894c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:45 +00:00
Hao Dong
07f6bede3e [automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours am: d69fbd1daa -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I832437e38bfdd2fa334ac8a8c70fbaf64e395851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:42 +00:00
Hao Dong
180742fd49 [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e -s ours am: 83e4a8a32d -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: I1ff672348e593bb1f9e832f0e4052f988ab73179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:19 +00:00
Hao Dong
84f8ea7113 [automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c -s ours am: e0aa02b138 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: Ib631d00d752f865fc574d6af787f6948c4ab6526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:56:16 +00:00
Automerger Merge Worker
b08f0ff404 Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp am: e4b8bdcead -s ours am: 902b39c57d -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history

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

Change-Id: Ic08657c3269e570dbffa62806e987ed6ac07f04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:53:19 +00:00
Matías Hernández
599217999a [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: a2c213f4f6 -s ours am: d5d0ba64cd -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Iad6b42c372cd6b40d6fb67d44c3b46d3aef4d38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:53:17 +00:00
Matías Hernández
58ef7bf643 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours am: 97062b969e -s ours am: 721c4098e8 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: I587152ec2e15c0cab4fcb6aced9049c09b75d4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:52:13 +00:00
Hao Dong
dc21a409fe [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 am: b911186928 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I0fca28be9994212bca22a6f29ee4a67fd0658f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:52:03 +00:00
Hao Dong
4a594a2b97 [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e am: 55ec9b88d6 -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: Ib9cd04fecc2870d3cd0a0cf4d9b45ecb9be1dc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:51:53 +00:00
Matías Hernández
63e9f8671f [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: e943c371a8 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: I9cefdb2945a0b351f9242403a9145420fb4c5165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:50:53 +00:00
Matías Hernández
9d181abd9f [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours am: ba88ece9fb -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Idad2762c3f560b8c749747ef43d22804f049c651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:36:12 +00:00
Automerger Merge Worker
902b39c57d Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp am: e4b8bdcead -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history

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

Change-Id: I6a51c90e5b6b699b7fb8d1416ab4a73c2bdce2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:11:49 +00:00
Matías Hernández
d5d0ba64cd [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: a2c213f4f6 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Ib79e52e66e8a3487715a6d919490d08cb272d4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:11:44 +00:00
Hao Dong
81edf4d6f1 [automerger skipped] Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: I35e212d33563d4a1c90298723d4b05d3c6560ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:11:05 +00:00
Hao Dong
d69fbd1daa [automerger skipped] Fix pattern rotation header text. am: 7b99d92464 -s ours 
am skip reason: Merged-In I36ec325b46d7a7f583d94dc26f9962cadc3874cd with SHA-1 35ebdefcd8 is already in history

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

Change-Id: Ic8bb8b1778222af56932685c8fdbceedc4b35fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:11:02 +00:00
Hao Dong
83e4a8a32d [automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: I2e657a847d2f74b1b81d8f8d3bf53cd8aaba98ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:10:41 +00:00
Hao Dong
e0aa02b138 [automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f3232c -s ours 
am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf68438 is already in history

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

Change-Id: Ia2b3d388b9a19eadd251f3bd847a7708134bf0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:10:39 +00:00
Matías Hernández
721c4098e8 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours am: 97062b969e -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Icabc8b2319b429685c5ab366ee24cf4f537dd975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:10:36 +00:00
Matías Hernández
ba88ece9fb [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Ife75d0a4306230505cc01d3fcbad4faf45f0e0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:10:13 +00:00
Hao Dong
b911186928 Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:06:58 +00:00
Automerger Merge Worker
70e8007715 Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 7af142c277 -s ours" 2023-06-30 00:06:45 +00:00
Matías Hernández
e943c371a8 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 62bd80ee29 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: If20b826b8880656e2fa36cd33a959dabc7af056f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:06:02 +00:00
Matías Hernández
ddd8ebf15f [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 7af142c277 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: I715d4ef983478d43173001b8be715f1fe9b77bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:06:00 +00:00
Matías Hernández
c2d187a8ec [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours am: 0d6f7211e4 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Ice28e8913e12be5a5741ce27f9758e802e8e1512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 00:05:57 +00:00
Matías Hernández
6ecf68ded7 [automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: c06e16ffe7 -s ours am: cbce103bb1 -s ours 
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history

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

Change-Id: Id1137d06623e9d87517be7a296fe8f25b49ab948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-29 23:52:54 +00:00