PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,303 Commits 1 Branch 0 Tags
5babf17c07f348081f6adccea603c1b38bb08b34
Commit Graph

121303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jigar Thakkar
5babf17c07 Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682

Change-Id: I734046dd9ac0c3580bcad43ad017feae5f6b04f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:20:40 +00:00
Jigar Thakkar
e78b3d3f7e Merge "Fix user starts by using startProfile" into udc-dev 2023-03-29 12:45:50 +00:00
Alexander Milantev
c3b4794c9f Merge "Avoid activity embedding if the activity is already embedded" into udc-dev am: b8beeb1cda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071824

Change-Id: Iacad07f090ec6075bbd47ef6f4276b1f43cf5a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 12:08:28 +00:00
Alexander Milantev
b8beeb1cda Merge "Avoid activity embedding if the activity is already embedded" into udc-dev 2023-03-29 11:26:39 +00:00
Jigar Thakkar
ee0c837117 Fix user starts by using startProfile 
We used ActivityManager.startUserInBackground earlier to start the clone
user. As per the changes done recently (b/267800984),
UserVisibilityMediator now marks all the profiles/users started usign
startUserInBackground as startedInvisible. This results in the apps not
being able to launch on clone profile without a device restart. To fix
this, in this change we move to using ActivityManager.startProfile to
start the clone-user.

Test: Tested on device by creating clone profile through settings app
Bug: 268011720
Change-Id: I4a594cd4d10cfbd7459b04baa45719885decf87e
 2023-03-29 10:58:23 +00:00
Zoey Chen
70ce5538ab Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev am: 082e8b03df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22305127

Change-Id: I2d61ed6b092d734fa5c94f08bf230c53ae1e2a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 09:45:02 +00:00
TreeHugger Robot
362ef0e2c5 Merge "Fix UI problem in system language list" into udc-dev am: 17d7ce6f87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323946

Change-Id: I4871e5fd1644dc79d5159760bf9f17a9e2004285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 09:44:23 +00:00
Zoey Chen
082e8b03df Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev 2023-03-29 09:39:33 +00:00
TreeHugger Robot
17d7ce6f87 Merge "Fix UI problem in system language list" into udc-dev 2023-03-29 09:31:24 +00:00
tom hsu
399bc86397 Fix UI problem in system language list 
- "Add a language" can not show "language" during font and display size
   turn into the biggest.
 - This is due to view hight limited, change to wrap content for
   solution.

Bug: b/275661390
Test: Manual test.
Change-Id: I306e09a92f3a9e047e6ab9a484e0b60f2b86cc62
 2023-03-29 15:55:01 +08:00
Taran Singh
c62df024a9 Merge "[Settings] Make scribe setting default_on and secure" into udc-dev am: a6c79eb283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21677959

Change-Id: I222751a3a247f806919a440c6eddd77a79fb549f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 07:48:06 +00:00
Taran Singh
a6c79eb283 Merge "[Settings] Make scribe setting default_on and secure" into udc-dev 2023-03-29 07:28:33 +00:00
Avinash Vadlamudi
a9bcdda890 Merge "[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off" into udc-dev am: 5e8769bcc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290364

Change-Id: I3d54eb7fdac859f4e882ff97adbd5b335150819c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 06:06:09 +00:00
Avinash Vadlamudi
5e8769bcc5 Merge "[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off" into udc-dev 2023-03-29 05:48:29 +00:00
TreeHugger Robot
5f654343cc Merge "Open the settings page for a specific physical keyboard" into udc-dev am: f145881a7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252142

Change-Id: If76872a90556b67bca44aac2907d902c9719a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 05:37:20 +00:00
TreeHugger Robot
eee79a064c Merge "Update theme transition for fingerprint in U" into udc-dev am: c49b50845e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918807

Change-Id: I8fc0517f5c3b140e2a7b006e02498ba2b85beb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 05:37:09 +00:00
TreeHugger Robot
f145881a7d Merge "Open the settings page for a specific physical keyboard" into udc-dev 2023-03-29 05:31:49 +00:00
TreeHugger Robot
c49b50845e Merge "Update theme transition for fingerprint in U" into udc-dev 2023-03-29 05:09:02 +00:00
Zoey Chen
cf88640701 [Settings] Remove the intent receiver due to the register exception 
Bug: 274899027
Test: atest SystemUIMicrobenchmark:android.platform.test.scenario.sysui.quicksettings
Change-Id: Ia19b91cfd1073f22180cc9679025447b4d5fecd9
 2023-03-29 04:57:08 +00:00
Zoey Chen
774da61059 Merge "[Settings] Start SettingsDumpService to dump the db log after the db is created." into udc-dev am: b1324b8753 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252149

Change-Id: I1ca31f495f2c5f2b758250fb3f3ddf031277919d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 04:42:47 +00:00
David Liu
92817616b1 Merge "Update flip camera for selfie gesture setting illustraion" into udc-dev am: 5c114b11bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22227192

Change-Id: I406e4c839a0d8c7fbf1c57cf0f8a30903b593c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 04:40:50 +00:00
Zoey Chen
b1324b8753 Merge "[Settings] Start SettingsDumpService to dump the db log after the db is created." into udc-dev 2023-03-29 04:09:46 +00:00
David Liu
5c114b11bd Merge "Update flip camera for selfie gesture setting illustraion" into udc-dev 2023-03-29 04:05:16 +00:00
TreeHugger Robot
a8a53e3d0a Merge "Add service link when no providers are present" into udc-dev am: 94d250162e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22238311

Change-Id: I64cc1974c3fdb414faf5e7a9c36adc296f45c8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 02:59:27 +00:00
TreeHugger Robot
94d250162e Merge "Add service link when no providers are present" into udc-dev 2023-03-29 02:26:03 +00:00
TreeHugger Robot
819239326b Merge "Fix SpaActivity launched twice for App Info" into udc-dev am: 8dc3e7752c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252146

Change-Id: I687d622ea8475d43b86094e142a0b7c6e07159dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 01:46:41 +00:00
TreeHugger Robot
4b5c8f6ced Merge "Correct the disable button text" into udc-dev am: 107690cb55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307475

Change-Id: Ibf944b896135f4e6d905da3abedc082c06bcc8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 01:44:41 +00:00
TreeHugger Robot
8dc3e7752c Merge "Fix SpaActivity launched twice for App Info" into udc-dev 2023-03-29 01:10:34 +00:00
TreeHugger Robot
107690cb55 Merge "Correct the disable button text" into udc-dev 2023-03-29 01:08:01 +00:00
Julia Reynolds
430b176e04 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours am: 1519918e3c -s ours am: 53a2145d73 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Ic8031194590cabf80190eae67b2d64fca404477c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:57:05 +00:00
Julia Reynolds
53a2145d73 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours am: 1519918e3c -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Iaaa6f3559c9e3002000d2d153a19be852c15c2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:48:26 +00:00
Julia Reynolds
1519918e3c [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Iec236411e347c5f11ae46a3fe339f402a34f0355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:12:41 +00:00
Becca Hughes
f9f3309fa0 Add service link when no providers are present 
Test: ondevice & atest
Bug: 273752971
Merged-In: Ia7080f5c44c2f59a386e00146b898228e5829988
Change-Id: Ia7080f5c44c2f59a386e00146b898228e5829988
 2023-03-28 22:51:33 +00:00
Julia Reynolds
76e801a289 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: 592574f05d -s ours am: a51d23bf71 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Idfe6c89c0b8c50df940bfee07cd2865caaed02ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:44:10 +00:00
Julia Reynolds
812747f662 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I16d62672bad5e2fe6f7a392355f05d32eb7df2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:35:17 +00:00
Julia Reynolds
a51d23bf71 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: 592574f05d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Idaeea45cc46c829d0188b91675de8bb4163e8f25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:33:25 +00:00
Julia Reynolds
592574f05d [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I34532bbc1689a65d9d5cac6325956e4931ee7a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:03:48 +00:00
Julia Reynolds
f1bd633fec [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I3f18d0dfa27c9b8efd19e9f551605f7ff345c145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:01:10 +00:00
Julia Reynolds
9f31d26292 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours am: bb787882ef -s ours am: 33f3f4ec14 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ife59be5392169223dec1c2664e9e88984d35a657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:46:27 +00:00
Julia Reynolds
40bec70af8 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:16:39 +00:00
Julia Reynolds
33f3f4ec14 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours am: bb787882ef -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I34f5d58e0783230d0a6f8d96afd375bde94a7a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:13:17 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:43:18 +00:00
Julia Reynolds
bb787882ef [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ic3ea8057dd4ec225ef8464c579919a8feef75252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:41:25 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:25:32 +00:00
Julia Reynolds
b66ece4192 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 8a344f301b -s ours am: 521e233c51 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ic371831771a0bb736450f42adeeabede78707b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:23:58 +00:00
Julia Reynolds
135489a1d9 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I53e932f4ab8997535abe729eb36d816c40b9145a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:14:52 +00:00
Julia Reynolds
521e233c51 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 8a344f301b -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Iec1626f7c6ac37a540ca2017998abd1d814a8e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:11:42 +00:00
Julia Reynolds
94ef1c333f [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ie295579d5360bdd8b35232e2233f8f572563357e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:46:09 +00:00
Julia Reynolds
8a344f301b [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I703bdb03adef5c11693b308a6e2f897417e43b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:45:07 +00:00