PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,988 Commits 1 Branch 0 Tags
aaaed2f0c142c8f89639a55b07a2591461f0778e
Commit Graph

113988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
aaaed2f0c1 Merge "Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back" 2022-08-09 10:54:16 +00:00
Menghan Li
dec32f804c Merge "Fix IllegalStateException to get tile content after device rotate" 2022-08-09 09:01:52 +00:00
Zaiyue Xue
8d0030d874 Fix b/241872474 Battery usage page will crash when selecting the last hour chart bar, going to app detail page, and going back 
This bug is because we always use mHourlyChartIndex to construct
every view model in mHoulyViewModels. However, mHourlyChartIndex could
be got from saved instance. So mHourlyChartIndex may be out of bound in
some hourly view model which has not many hours data.

This fix removes the selectedIndex in BatteryChartViewModel constructor. Suppose the selectedIndex should be set everytime the view model is used.

Test: manual
Bug: 236101166
Bug: 241872474
Change-Id: I0bb5568ac33fcc23c406fe3af308b8d2706c5542
 2022-08-09 16:39:36 +08:00
TreeHugger Robot
7dad6940d4 Merge "Avoid NullPointerException when batteryLevelData is null." 2022-08-09 08:33:41 +00:00
Himanshu Rawat
36a3e977ea [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours am: 245a52c010 -s ours am: cd64f0e384 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I008d39e9d0e48cd1b560f72e19e42cc44ce0ae14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:21 +00:00
Himanshu Rawat
49ab75569b [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours am: e8dc99088c -s ours am: 22691cc301 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I7eb8b585c8d60691ced1a730cad51495a50e0d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:19 +00:00
Himanshu Rawat
974689a7fe [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: 58834bca2c -s ours am: b6be4770ac -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I5f3152f03b82c23cdbe8a59dffe9e9175501d646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:10 +00:00
Himanshu Rawat
ebdad23080 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 99d6748582 -s ours am: a06469ea63 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I576d09eb41c8cafcd6a7a63cb8ae29d5b9275dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:12:09 +00:00
Himanshu Rawat
1aa9df0e60 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: b132484ead -s ours am: 61ca4c719f -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Iad8208643f92845ce6c88c1eee44c9d94eb15cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:11:36 +00:00
Himanshu Rawat
9c62319a93 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 8e5f1b5b74 -s ours am: aed2e13f2f -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Id575da38bb1854bd84af75cc1ce7ebd2b0388de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 08:11:32 +00:00
Himanshu Rawat
cd64f0e384 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours am: 245a52c010 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ifcbee62366faa4dfc906aeb7785e592d3589cd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:47:21 +00:00
Himanshu Rawat
22691cc301 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours am: e8dc99088c -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I4692f2aa8ee487cbe005edfd4225aba6735a85d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:47:20 +00:00
Himanshu Rawat
b6be4770ac [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: 58834bca2c -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I3eea077c3f5b16f03454120371c9c0192a9a2c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:51 +00:00
Himanshu Rawat
a06469ea63 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 99d6748582 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Idd08fef437d09c0075b839ff56a32878588bcf6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:50 +00:00
Himanshu Rawat
61ca4c719f [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours am: b132484ead -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ib755cca4f05697d9f697ae956c548141b8b5a04b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:33 +00:00
Himanshu Rawat
aed2e13f2f [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours am: 8e5f1b5b74 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I47a92c8f202fc77b83b01d7dcc93d6ae1fe23ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:46:31 +00:00
TreeHugger Robot
bfa7616759 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 88f6533667 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I382a8d3c3ad8e94349d7733c29aaa40c412b085b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:35:50 +00:00
Bill Yi
407aa78ef5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0476afd502 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9e6058aa57f3c48c0eac0b75bf8cbea29066b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:35:48 +00:00
TreeHugger Robot
4972ca0993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 4dd6ed1153 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I832207bfc56227472386e7d8a99e972d177879a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:35:47 +00:00
Himanshu Rawat
e5477792e1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 am: 61482c425e -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Id34f12276b9359ec68683363fa6876e87c940faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:33:23 +00:00
Himanshu Rawat
245a52c010 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 6d05b035d1 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Idf957cd9af66d98c320c36b4d06875840a9eb16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:08 +00:00
Himanshu Rawat
e8dc99088c [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 6b7e6b9fcd -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I89e332a273db1c01eef63f7c560ffad79db383c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:07 +00:00
Himanshu Rawat
b132484ead [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I51e6b4fc0193135ccfc03192df2ac7d17f062609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:06 +00:00
Himanshu Rawat
8e5f1b5b74 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I4ba3832a21f6dde054f83f78a608b613bccf79d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:05 +00:00
Himanshu Rawat
58834bca2c [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours am: 12705de9c8 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ieff7ef668240ea57dfc5d098252a680a6eace1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:02 +00:00
Himanshu Rawat
99d6748582 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours am: 02062edb25 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I4b52705de96200bf8fb5bb551a43f1bf51409dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:31:00 +00:00
TreeHugger Robot
88f6533667 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-09 07:10:47 +00:00
TreeHugger Robot
4dd6ed1153 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-09 07:10:47 +00:00
TreeHugger Robot
53c7800d96 Merge changes from topic "tc_change_22080720_16" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 935231bb97
  Import translations. DO NOT MERGE ANYWHERE
 2022-08-09 07:10:47 +00:00
Himanshu Rawat
12705de9c8 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: I2ecc3ff311794336743d574f75054bae032375e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:42 +00:00
Himanshu Rawat
02062edb25 [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50 is already in history

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

Change-Id: Ie9b244a71a6fdebe3a7b10425fe0061e23f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:05:41 +00:00
Himanshu Rawat
61482c425e Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651

Change-Id: I71ca4f0c9ab8e37c63ecd21783714488c27bbd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:58 +00:00
Himanshu Rawat
6d05b035d1 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ic8a8b0b5165d6d433331e3c3acac9f1042c76428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:21 +00:00
Himanshu Rawat
6b7e6b9fcd [automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I4ad185ed4f71048d2aeb756cf1384e06452dc2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-09 07:04:17 +00:00
Himanshu Rawat
f073d27097 Merge "Don't cancel passkey entry pairing autonomously" into tm-dev 2022-08-09 06:42:00 +00:00
Kuan Wang
8d88148036 Avoid NullPointerException when batteryLevelData is null. 
Bug: 236101687
Bug: 241738105
Test: make RunSettingsRoboTests
Change-Id: Iee04f96083eff7ff5cd61a7c1f2eda20a6dc9149
 2022-08-09 14:10:44 +08:00
TreeHugger Robot
68ed2fb752 Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" 2022-08-09 03:47:33 +00:00
menghanli
1ca385591a Fix IllegalStateException to get tile content after device rotate 
Root cause: Race condition to get content after the onDetach()
Solution: Add protection to prevent this IllegalStateException

Bug: 239578655
Test: make RunSettingsRoboTests ROBOTEST_FILTER=OneHandedSettings
Test: Manual testing by rotating 100 times quickly
Change-Id: I0a03cf1c01cd34c8ae0b0e70c4ffc41168b18ab8
 2022-08-09 02:36:59 +00:00
TreeHugger Robot
248895db72 Merge "Use setting as base activity for fingerprint" 2022-08-09 00:05:45 +00:00
Automerger Merge Worker
d7d9c9230a Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf5534b am: a3e8d15e45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: I96031df3304320359d7f65e506128ca43c26c568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:38:45 +00:00
Bill Yi
293f7ed7a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours am: 400ee96a23 -s ours am: 8491ffc957 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35c1127beff15bc404170ab7202cdae87a1d2fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:38:34 +00:00
Bill Yi
883d1f9d8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: e1617e2547 -s ours am: de8d1f362e -s ours am: 0396db20d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59487966a4604e4433f25f08b1d788d94d4dde98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:30:28 +00:00
Bill Yi
1541e74118 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 9a59cb4425 -s ours am: 7a6cfc59bc -s ours am: bb70dd6d3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id359c63ce167da978d1fdd691d99062cc21f06d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:30:22 +00:00
Bill Yi
93b8f08310 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 339f517c18 -s ours am: 4e8f9c0dbf -s ours am: 9aeb49e969 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74926b8c25f6f4884552e16a54f67a0ce3dffeec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:30:09 +00:00
Bill Yi
9982632d8c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 065b5806ef -s ours am: 05199e1e03 -s ours am: 9245ecf252 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6aebcb32982be9173c3ec3d73d187a65734814c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:29:59 +00:00
Automerger Merge Worker
a3e8d15e45 Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp am: 355cf5534b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238

Change-Id: I68386ae4212ba7ee402a537d61c4a3db92e9c040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:24:40 +00:00
Bill Yi
8491ffc957 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours am: 400ee96a23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05753b7c69cb5dbcdac71302307dc5d2fde00d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:24:24 +00:00
Bill Yi
6774f7218a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: ba8de85603 -s ours am: 5fa5132f34 -s ours am: 6915f8d941 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80ed7fb1075ab98a19ba8552999d9108bafc7537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:18:29 +00:00
Bill Yi
a7ccdf821c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours am: e52590665b -s ours am: 45b42b3c77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e10a2bc168cf29f463fad90434e1900035a1d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:18:19 +00:00
Bill Yi
40937d46de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours am: c6584ab4bd -s ours am: 81c078b3a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If541cb3c7796fec63874186508ccff59fddc3d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 15:18:06 +00:00