PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,890 Commits 1 Branch 0 Tags
219b28bb8d97c13d5566c632b1323ff7f99984f5
Commit Graph

114890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grace Cheng
219b28bb8d Implement SFPS guided enrollment for T6 
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
 2022-08-31 20:15:55 +00:00
Austin Delgado
6c5b859da2 Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967 am: 71b2bb8f5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: Ifdefdaadcc36b326ac498eed1cca79e1574cb2bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 18:06:53 +00:00
Austin Delgado
71b2bb8f5c Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev am: bbcdc91967 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19582557

Change-Id: I7270f6c80cef2c28697e1ba85c9fcaaf57f25263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 17:37:21 +00:00
Austin Delgado
bbcdc91967 Merge "Made learn more links clickable in biometric intros" into tm-qpr-dev 2022-08-30 17:15:49 +00:00
Omer Osman
5d78a3aac6 Merge "Update Opus over A2DP to use BluetoothCodecConfig api" 2022-08-30 16:19:27 +00:00
Bill Lin
7ab0629412 Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f am: 2db995725b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: I71ec6e696bc2a145c1deffdc76404bcaa2f58a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 12:54:19 +00:00
Bill Lin
2db995725b Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev am: 7d15cb501f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699461

Change-Id: If2c57ce270318368690eba8ed6680ab20f3dd260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 12:24:51 +00:00
Bill Lin
7d15cb501f Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev 2022-08-30 12:06:47 +00:00
Daniel Huang
7505e97ce9 Merge "Separate "Keyboard" from "Language & input"" 2022-08-30 08:20:14 +00:00
TreeHugger Robot
749c963f2b Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6 am: a8fe097b6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508

Change-Id: I32d8a438fa3a017b14782f3a9fceef909b90464e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 07:08:33 +00:00
TreeHugger Robot
e3777635c4 Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6 am: 8c232535cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527

Change-Id: Icf0e9dd027596c52594bc76f9bf6b9c54c50d966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 07:07:51 +00:00
TreeHugger Robot
a8fe097b6a Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508

Change-Id: I19b929cca3d6c9f0b48fa8a29c2245ff92c88ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 06:38:39 +00:00
TreeHugger Robot
8c232535cf Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev am: 226107f1d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19755527

Change-Id: Ic0537775efd1294e9896adf5de3e61b84900fa09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 06:38:20 +00:00
TreeHugger Robot
baa3f3a3c6 Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev 2022-08-30 06:22:53 +00:00
TreeHugger Robot
226107f1d6 Merge "For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion." into tm-qpr-dev 2022-08-30 06:22:14 +00:00
danielwbhuang
c9cb6806f6 Separate "Keyboard" from "Language & input" 
1. Separate "Keyboard" from "Language & input".
2. Use FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI to control the
   different UI until Settings launches the new UI design.

Bug: 242680328
Test: local test
Change-Id: Id1ea6d3e3c2e6b83bc4b4d835c6b27e31311c530
 2022-08-30 14:22:05 +08:00
Jenhou (Alan) Huang
c0461e645c Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9 am: 6983f5867c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988

Change-Id: Ic5ec27462b8472b1f1ac7fd268be64764ed139c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 06:12:29 +00:00
Jenhou (Alan) Huang
6983f5867c Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988

Change-Id: I1891fca86dcff9c0251ba56f81f183ac76120162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 05:43:38 +00:00
Jenhou (Alan) Huang
95912773f9 Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev 2022-08-30 05:11:39 +00:00
TreeHugger Robot
196f517c75 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb am: a585bebcc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: Ibe3607cfaaf8b91c8ab6beccc6d305e8edcb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 01:23:59 +00:00
Milton Wu
bffaaf671d [automerger skipped] Fix udfps fingerprint setting flow am: d3a1f700ee am: 7856ab058d -s ours 
am skip reason: Merged-In I62d945f2c2e980edf2a885234e54acae109e7672 with SHA-1 936dd31312 is already in history

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

Change-Id: I25caed3661bb7516392600e4526fcc22e5959ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 01:23:58 +00:00
Milton Wu
60496c13c6 [automerger skipped] Use setting as base activity for fingerprint am: 561a68db20 am: 84c9a6308f -s ours 
am skip reason: Merged-In Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd with SHA-1 84b39c3ed0 is already in history

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

Change-Id: I1da88e2a818b696febde02a0724846738de93378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 01:23:56 +00:00
Milton Wu
127fb0ae8e [automerger skipped] Use Mockito 4.6.1 FingerprintEnrollFindSensorTest am: e167286a37 -s ours am: 9ebaaa87b8 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I7dd9d8bddefd48f5b2147bb72fd5a021ee57e1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 01:23:53 +00:00
TreeHugger Robot
a585bebcc8 Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093

Change-Id: I3b0053910613af42ecc91b8a416b131c662c1837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 00:53:37 +00:00
Milton Wu
7856ab058d Fix udfps fingerprint setting flow am: d3a1f700ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732077

Change-Id: Ib1e8d3aa448dca12b656bb4e0fcb3a3e85c394ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 00:53:35 +00:00
Milton Wu
84c9a6308f Use setting as base activity for fingerprint am: 561a68db20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076

Change-Id: I84e533045cb9043e71634400081d02d2f04faf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 00:53:34 +00:00
Milton Wu
9ebaaa87b8 [automerger skipped] Use Mockito 4.6.1 FingerprintEnrollFindSensorTest am: e167286a37 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I17940dd52a3a941112cc4c39a70dfec30086de17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-30 00:53:30 +00:00
TreeHugger Robot
c8f45f75eb Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev 
* changes:
  Bypass cancel error code during "Add another"
  Fix udfps fingerprint setting flow
  Use setting as base activity for fingerprint
  Use Mockito 4.6.1 FingerprintEnrollFindSensorTest
 2022-08-30 00:22:53 +00:00
Lauren Winston
28b4b34f92 Add toggles for two Software Cursor settings: keyboard shift and trigger 
hints.

Bug: 242218807
Test: atest SoftwareCursorKeyboardShiftPreferenceControllerTest and
SoftwareCursorTriggerHintsPreferenceControllerTest

Change-Id: I872291ee90b54842b237868a72d61b38efbfd886
 2022-08-29 22:12:46 +00:00
Alan Huang
a0da5b36bc [VolumePanel] Redirect volume panel action to SystemUI 
The volume panel is moved to SystemUIDialog, so we
redirect the volume
panel creation to SystemUI.

Bug: 202262476
Test: manual build and use adb to launch with the volume panel action
intent. $adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I9f23eb68fb7c83d6f0f023f5eefc4290a35db3c3
 2022-08-29 18:50:30 +00:00
Xiaowen Lei
6a6fca85a5 Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev am: 6a6374bc9b am: f4ead190ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19748830

Change-Id: Ic3f4b16dca9c2deb36d5b37ff66982f7ab6fc699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 17:08:38 +00:00
Xiaowen Lei
f4ead190ef Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev am: 6a6374bc9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19748830

Change-Id: I3ce6d60442ba1dd4d3b49406910eab7559da8d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 16:49:19 +00:00
Xiaowen Lei
6a6374bc9b Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev 2022-08-29 16:32:40 +00:00
Milton Wu
af5a7d8dc0 Bypass cancel error code during "Add another" 
1. When user chooses "Add another" on latest fingerprint enroll page, we
   shall bypass RESULT_CANCELED from FingerprintEnrollEnrolling. This is
   because user has successfully enrolled a fingerprint before enter
   FingerprintEnrollFinish page.

2. In FingerprintEnrollFindSensor
   A. Do not call startLookingForFingerprint() if mNextClick is true
      because it is wating the result back from
      FingerprintEnrollEnrolling, and let onActivityResult() mehtod to
      handle correct behavior.
   B. Add tests for following cases
      a. Sidecar existence
      b. Activity recycled and recreate in order to get activity result.

Bug: 243701933
Bug: 243762418

Test: ROBOTEST for SetupFingerprintEnrollFindSensorTest,
   FingerprintEnrollFindSensorTest, SetupFingerprintEnrollFinishTest

Test: Test scenarios w/ and w/o always_finish_activities
  1. Enroll a fingerprint but cancel it during enrolling in SuW
  2. Enroll a fingerprint in SuW
  3. Add another fingerprint in SuW
  4. Run "Add another" but cancel it during enrolling in SuW
  5. W/o enrolled fingerprint, add first fingerprint in settings
  6. W/o enrolled fingerprint, add first fingerprint but cancel it
     during enrolling in settings
  7. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" in settings
  8. W/o enrolled fingerprint, add first fingerprint and choose "Add
     another" then cancel it during enrolling in settings
  9. W/ 1 enrolled fingerprint, add fingerprint in settings
  10. W/ 1 enrolled fingerprint, add fingerprint but cancel it during
      enrolling in settings
  11. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" in settings
  12. W/ 1 enrolled fingerprint, add fingerprint and choose "Add
      another" then canel it during enrolling in settings

Change-Id: I03d8d8ebc39eb34f8fc28acb5cd267e37c7a0311
 2022-08-29 07:22:45 +00:00
Milton Wu
d3a1f700ee Fix udfps fingerprint setting flow 
1. on udfps + faceunlock devices, fingerprint settings shall not be
   launched if no fingerprint enrolled.
2. on udfps device, after first fingerprint enrollment successfully,
   fingerprint settings shall be shown.
3. Update FingerprintEnrollFindSensorTest to support udfps cases.

Bug: 243701933
Bug: 243003012
Test: manully adding first fingerprint on udfps + faceunlock device
Test: manully suw on udfps + faceunlock device
Test: run robotest for FingerprintEnrollFindSensorTest
      and SetupFingerprintEnrollFindSensorTest

Merged-In: I62d945f2c2e980edf2a885234e54acae109e7672
Change-Id: I62d945f2c2e980edf2a885234e54acae109e7672
(cherry picked from commit 936dd31312)
 2022-08-29 07:22:40 +00:00
Milton Wu
561a68db20 Use setting as base activity for fingerprint 
Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.

Bug: 243701933
Bug: 232874879

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
      SetupFingerprintEnrollFinishTest
      FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest

Merged-In: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
(cherry picked from commit 84b39c3ed0)
 2022-08-29 07:21:42 +00:00
Milton Wu
e167286a37 Use Mockito 4.6.1 FingerprintEnrollFindSensorTest 
Due to java import has been changed in downstream, update import part to
use Mockito 4.6.1 inside FingerprintEnrollFindSensorTest to prevent
downstream merge conflict.

Bug: 243701933
Test: roboTests FingerprintEnrollFindSensorTest
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
Change-Id: Idbf7852d95b248293909f73a0cce69de166931c9
 2022-08-29 06:44:32 +00:00
Zaiyue Xue
bae18f1386 For battery chart 7-bar case, remove the center two labels according to UX designer's suggestion. 
latest screenshots: https://drive.google.com/drive/folders/1V2UoBO2tOVydVxT5Yd5ASruuzizy-s7F?resourcekey=0-z2UInYUQ3mLGG80hedO78A&usp=sharing

Test: manual
Bug: 242009481
Change-Id: I3f717add0bcce1d3697c9ff6e91032e3817e6304
(cherry picked from commit 53b816c7be)
 2022-08-29 05:42:33 +00:00
Zaiyue Xue
457aaffa50 Support showing battery level chart first immediately after the battery level data is ready. 
When the battery level chart is shown but app usage data is not ready,
the battery chart is still clickable, but the app list won't show. Once
the app usage data is ready, the app usage list of the latest selected
period will show. Please see the following screen record of forcing
loading app usage data very slow. In the real case, the app usage
loading is not that slow.

https://drive.google.com/file/d/196rlzwSa52xrQFRfF2gdHJJPZn-uecZF/view?usp=sharing&resourcekey=0-mGggQGG7IMd5-bSAG7l_LA

Bug: 243887839
Fix: 243887839
Test: manual
Change-Id: I170eb4afb46b1d0040b7971460b1b37dde5d1362
(cherry picked from commit adc36d085b)
 2022-08-29 05:42:12 +00:00
Les Lee
7f57ed8ea8 Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev am: b75858bf82 am: 03cb9dcb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491094

Change-Id: If2a889addd5a9d2a18960ac8c61173af6592a045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 02:21:40 +00:00
Les Lee
03cb9dcb8a Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev am: b75858bf82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491094

Change-Id: I65a54ab88204a4dfd484a8faf157d6b9db5b3f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-29 02:02:41 +00:00
Les Lee
b75858bf82 Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev 2022-08-29 01:38:58 +00:00
Bill Yi
3b1100598c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 71d1cd4557 -s ours am: de4cbf230a -s ours am: b248478dba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83b36ac15019d6567ad75b84f3484b1d4220bebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:43:50 +00:00
Bill Yi
5ab80b7b4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: a947d0a622 -s ours am: 99e160c962 -s ours am: 6b980bf876 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadfbc2d9fa287a03635316c767d942becf422a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:43:41 +00:00
Bill Yi
85ef4eff22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: fae53cfbdf -s ours am: 77b9e7dd75 -s ours am: 677ac24df6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia74b7a3f0238a607e24d44f8b763675f68c99503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:43:26 +00:00
Bill Yi
5ce857f3d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: c10285fbdb -s ours am: 68561fb157 -s ours am: ba4376a02e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I480ce955d04f90ae37f70ad8d02ce486412fc362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:43:14 +00:00
Bill Yi
590efa6588 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -s ours am: ac0506a4f3 -s ours am: a32347b8ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3060d3124ca1b7a608f57f17d4a24e5467f70af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:40:17 +00:00
Bill Yi
65e6482b9d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -s ours am: be10423638 -s ours am: e82d020fe1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99a570dc57380a76d139881b2b18b5b2ac08765f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:40:07 +00:00
Bill Yi
5581a24148 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -s ours am: 8cef8bb893 -s ours am: b7780bb944 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49f154227fcf1fab1691d94ebeb5fda87bf8e4c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:39:54 +00:00
Bill Yi
137748fc1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -s ours am: c37d1eccee -s ours am: 47f652a7c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34e847428110aeaa149ebe0f14938490c405f6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 03:39:42 +00:00