PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,064 Commits 1 Branch 0 Tags
f61d20ef0f8d9b5fe44c03eb7957bc8385b08a2c
Commit Graph

122064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
7871a9e9bd Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I998baee786f01ee74743a02d369f8159caa89ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:06:29 +00:00
Treehugger Robot
60d9be5a0a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" 2023-03-31 08:20:36 +00:00
Bonian Chen
61e6c46fa7 [Settings] Avoid from user without sufficient permission to change WiFi 
calling

Enhance security control through close UI when accessing by user with
restriction.

Bug: 262390632
Bug: 262243015
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSettingsTest

Change-Id: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
(cherry picked from commit a1d3fe061e)
Merged-In: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
 2023-03-31 08:15:45 +00:00
Hieu Dang
bb864d9016 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I838c3a9650ac7312539137f682bbbca79431abd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:05:42 +00:00
Hieu Dang
968dfc9c2e Merge "Check availability on start for TetherSettings" into udc-dev 2023-03-31 06:30:53 +00:00
Hieu Dang
12fc50ca3b Check availability on start for TetherSettings 
mUnavailable variable is only assigned when creating the activity. This make the app crash when we disable tethering and then resume + toggle on the Bluetooth Tethering. This cl remove the variable and directly check whenever the app start.

Bug: 270285631
Test: manual
Change-Id: I0dff1d11cbcc06816a69985f96eee828bb83e87c
 2023-03-31 05:30:44 +00:00
Hao Dong
3e2efc17c6 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I4dfa3809e0649903559d24b210666a1c2eca5856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:27 +00:00
Hao Dong
9ff72e4205 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev 2023-03-31 04:44:16 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio" 
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
 2023-03-31 12:43:14 +08:00
Angela Wang
f1aed58005 Improves Settings search result of Flash Notifications 
1. Shows "Accessibility > Flash notifications" instead of "Notifications
   > Flash notifications".
2. Hides intro preference in search result.
3. Adds search keywords on Flash Notifications page entry.

Bug: 275649264
Bug: 275553435
Test: searches some queries and checks UI manually
Change-Id: Ie6616b779af77153126846748d1052fb29974e3b
 2023-03-31 03:59:09 +00:00
TreeHugger Robot
d98811b04b [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I63e194734a8707cd5eed8b904e0cf7f7800580ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:33:27 +00:00
Hao Dong
b0ff672a7e Post-enroll settings screen shows class 3 strings 
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
 2023-03-31 03:05:57 +00:00
TreeHugger Robot
f8717edcbd [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: Ic83c4f5c399c330f0c0d080d0e798bd7335bc7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:58:30 +00:00
TreeHugger Robot
3771564adc Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719

Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:23:13 +00:00
TreeHugger Robot
0362083f3a Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev 2023-03-31 00:20:15 +00:00
TreeHugger Robot
a1bd3746e6 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ic321f309e935c06f785a9ddb9e3e5314ae0f9131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:49:27 +00:00
Chris Antol
7bfd10736c Enable hover states for SeekBarPreference 
Bug: 201499839
Test: manual testing on pixel device with wired mouse

Note: change was originally set for TM-QPR branch, but now targeting UDC-DEV instead
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec11542cbe14f874c9fe17ee4c2a4c4e29ea748c)
Merged-In: Ibbbd0e0ef627576acb5eb3f4acb6d40dcceb0371
Change-Id: Ibbbd0e0ef627576acb5eb3f4acb6d40dcceb0371
 2023-03-30 22:24:26 +00:00
Julia Reynolds
07fcd1f503 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie868cf81b7b518fdbe90482cd88b8fc2206cf165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 22:16:23 +00:00
Automerger Merge Worker
c22e3947f5 Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ia18251a7a159984c6fcaf9a92cdc169196df1fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 21:27:48 +00:00
Julia Reynolds
0f81ebfda9 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Iab57a8f2cde0d209093b57b09816fa594fe25ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 21:26:08 +00:00
TreeHugger Robot
930b2d4907 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I408bc5e28097b0eee96f9f8eb16b975c9fbe6346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:47:31 +00:00
Bill Yi
5c8af76e32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e77adbef43aa18efcc5127ff3313653c9c91bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:47:27 +00:00
TreeHugger Robot
8b9d7a3330 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86b674308bc16b69734d3e0482a5293700e08593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:47:15 +00:00
Bill Yi
a53df4df90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I612c59bd37ed8bada17680d9e950e590570652f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:47:01 +00:00
TreeHugger Robot
17e504f6a8 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:39:38 +00:00
TreeHugger Robot
f02d69dd4f Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:04:20 +00:00
TreeHugger Robot
d8ca3881ae Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I2d97c089e7da9b2f955bff2f582a5d2fac3606f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:00:30 +00:00
TreeHugger Robot
488b5beb34 Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: I8340a8631de1e8ac74681042f9139cc2d4385dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:00:23 +00:00
TreeHugger Robot
49e36c9c55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63111ff1df19f3006a54a217556d8bd9482da38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:00:15 +00:00
Yanting Yang
72b8392b23 Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650

Change-Id: I1ccf44c2ee3cdcffcd6f1a92eff8409832174cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:00:08 +00:00
TreeHugger Robot
c807f85dc8 Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I322fad46d2c96858923082030c2bed31884e07ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:59:56 +00:00
TreeHugger Robot
e23eed7706 Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: Iab93217fbc909be36122a98482ed8fcc0925a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:59:11 +00:00
TreeHugger Robot
98e2c7dbf0 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: I48f0c77d0e236249192368bc853d033780d1593e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:59:02 +00:00
TreeHugger Robot
a9bb4e14f0 Merge "Remove unused listener" into udc-dev am: a99c64dfde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: I4981fa9180b398f9dbb767e208a83db5461cf3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:58:45 +00:00
Julia Reynolds
fc865d217d [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I85c1bcef79fdc660b8302e7e3baae730ff89d63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:38:21 +00:00
TreeHugger Robot
5bde972e4e Merge "Restrict DataUsageList for guest user" into tm-qpr-dev 2023-03-30 19:08:44 +00:00
Julia Reynolds
9cbd3bdb54 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I0e68d9ee05a4b7fa0a5c38d1ac5138ae4272b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:57:52 +00:00
TreeHugger Robot
0edd4e2b9a Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I3a41df3de7c9766aa1acf631e8db07dcfc823938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:45:13 +00:00
Bill Yi
5caf2a7e4e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99c5dff5d265acbfead5690311b9bfc3475a6679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:44:59 +00:00
Julia Reynolds
bee2aa0c8b [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I963414b8f0ab062e653ef5d4840d0c048f984144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:42 +00:00
TreeHugger Robot
2094e9d0c2 Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I9d53109132363f5f8bcb3289461efb5abe79f413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:32 +00:00
Bill Yi
8452984341 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d4c3dfad42abb3a98bf9001cccef5f7766dc9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:30 +00:00
Automerger Merge Worker
d7a04c0467 Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev 2023-03-30 18:09:08 +00:00
Julia Reynolds
fd60b8f6e2 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie5eb9b7ca3cc8e0cef4c089d1921f1b172d2a568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:07:36 +00:00
TreeHugger Robot
7c6a59f183 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bb2163ceb952297b85e727b263fea044a3df8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:07:00 +00:00
Bill Yi
9f71ec4375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica20e5f531ff51bd05a356c0ea985a37ce6157d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:56 +00:00
TreeHugger Robot
ce7f901993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I346438976fefed962e0fff4565c738a594de0ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:49 +00:00
Bill Yi
f75cf95c2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4371f0ce39c336df758cf2477fb601f717bc100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:29 +00:00
Julia Reynolds
2a66721ccf [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie50619f573b47b5998b52d2933465e09397124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:37:28 +00:00
Julia Reynolds
f445bb3b32 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie5dfb22c27e0557719ddd96c104f5582f6c14b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:36:12 +00:00