PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,926 Commits 1 Branch 0 Tags
4da27ff2bd5ef25d30ab0adf61c3a9473d261c8c
Commit Graph

109926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Chiu
0e2147c5e2 Fix the injection disappearance in the Account detail page 
displayTile() requires some parameters to determine whether to show the
injection tiles and update the intent, but the parameters were not
initialized.

Move the parameter initialization before super.onCreate() since
displayTile() will be called in super.onCreate().

Test: visual, robotest
Fix: 242673595
Change-Id: Idf2d758a8b8c4230e644bcd0d286a278d258b736
 2022-08-30 06:46:39 +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
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
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
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
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
Shen Lin
b25f123d9f Add null check for mIntent in ZenRulePreference to avoid potential crash risk 
Bug: 244120502

Test: manual test, ZenRuleScheduleHelperTest for unit test.
Change-Id: Ib7338253783bb09b84b629f2dd891292d82f28b2
 2022-08-29 19:19:59 +08: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
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
b248478dba [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 skip reason: subject contains skip directive

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

Change-Id: Ie619ba38b60c0100e9a9ba1052c5b0788dc76ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:46:43 +00:00
Bill Yi
6b980bf876 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: a947d0a622 -s ours am: 99e160c962 -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: Ia43413954410861658a477e6a06755a861f22baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:46:33 +00:00
Bill Yi
677ac24df6 [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 skip reason: subject contains skip directive

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

Change-Id: I2652b2aaa72dcc6bb73d55711c975f59f50843d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:46:19 +00:00
Bill Yi
ba4376a02e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: c10285fbdb -s ours am: 68561fb157 -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: Ib58749bbbccc75d80b7ed84c5386315f08edce0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:46:06 +00:00
Bill Yi
a32347b8ce [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 skip reason: subject contains skip directive

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

Change-Id: Ie3f053c6b3ba941ef8650274aec74344f7d8c451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:43:16 +00:00
Bill Yi
e82d020fe1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -s ours am: be10423638 -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: I8a38f288f4d829fe84176875c6e2accf39e2cb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:43:08 +00:00
Bill Yi
b7780bb944 [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 skip reason: subject contains skip directive

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

Change-Id: I6de10e975a801dd71ff4344c9ba997f2b6259cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:42:55 +00:00
Bill Yi
47f652a7c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -s ours am: c37d1eccee -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: I8cf1082760b464c120c37c4d3aa3a13aeff3714c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:42:38 +00:00
Bill Yi
de4cbf230a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 71d1cd4557 -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: I73a6bf7a43107956349dc8bf6cdd78da6e68dc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:38:03 +00:00
Bill Yi
99e160c962 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: a947d0a622 -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: I92261d96ef6b8fde2b375575ccbfbf43c372b748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:50 +00:00
Bill Yi
77b9e7dd75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: fae53cfbdf -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: I7c1bee9a073fbd39da951262de4a5ec3df49a6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:36 +00:00
Bill Yi
68561fb157 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: c10285fbdb -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: I7f5693e7baa353d4e2258aa444277f47b5578995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:37:25 +00:00
Bill Yi
4d0f4e9c2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -s ours am: 0a08da4ca8 -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: I31650a89fe618d57e8427fc9785c3c21e3aa678c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:35:04 +00:00
Bill Yi
1344da6685 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -s ours am: 521735e2aa -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: I582f124dd6c098578e031ebe10f76db2ef8d92e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:34:54 +00:00
Bill Yi
0ad6470854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -s ours am: a371b6dd21 -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: I9b69665c1116b75abf31cf4bb05c5b940f75629d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:34:40 +00:00
Bill Yi
a5fdca8211 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -s ours am: 676cc83e25 -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: Ib95f5113902a30f163cb057d65a8cba19582047a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:34:30 +00:00
Bill Yi
ac0506a4f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -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: Ieed1b825fef248bd880ea486a0d9ffbc1151d634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:28:41 +00:00
Bill Yi
be10423638 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -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: If013bf252122759c7d320eb0189dfd33355478e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:28:31 +00:00
Bill Yi
8cef8bb893 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -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: I787d3b0885874540ef95b94ba3909ff4c654d761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:28:17 +00:00
Bill Yi
c37d1eccee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -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: I83bf17ebf1f3bd1403f552120073fde97650a6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:28:05 +00:00
Bill Yi
0a08da4ca8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -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: Ia2fe60452dec4348ca6fe7d177f03942d65f9969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:26:10 +00:00
Bill Yi
521735e2aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -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: I3657f8f740c010700a3199a50d9d20b58ff94441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:26:01 +00:00
Bill Yi
a371b6dd21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -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: Iba7623004fd8c2ca19ed2ca188e148b063924a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:25:47 +00:00
Bill Yi
676cc83e25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -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: Id738ed8783958f6afdcc578e6f366cae70fd2192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-28 02:25:34 +00:00