PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,643 Commits 1 Branch 0 Tags
1f30e66ce1a234fa5823bc7ff611fad7354bbb33
Commit Graph

112643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
6426382e90 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-20 21:30:34 +08:00
Zaiyue Xue
7e6aa69cca Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2 am: 6470ada117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3d6a155e80a5d54c309061c41d0b6436e61cc4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:42:01 +00:00
Zaiyue Xue
6470ada117 Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:32:47 +00:00
TreeHugger Robot
d13bcb645a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours am: dcdc9374ae -s ours am: 53561dc427 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6de7ceb29cd33aadcbec3357ab917ab139d60b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:24:20 +00:00
Bill Yi
b15bece5f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours am: 2c0551238e -s ours am: 509791ae49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I078c281f29301c4cacf7211f15d09504892d564c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:24:03 +00:00
Bill Yi
1f6526a2d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours am: b48231e5a2 -s ours am: 4e75fe4146 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52b70246e8b04198926f22918f0ff2845d2ba50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:18:18 +00:00
Bill Yi
c530eb5ef5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours am: 30583caa75 -s ours am: 251a3f5db7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5889837190e926ce3bfcc82f903cd5e078149a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 09:13:46 +00:00
Zaiyue Xue
3b7953eac2 Merge "Move battery usage files to a separate folder." into tm-qpr-dev 2022-06-20 09:12:04 +00:00
Automerger Merge Worker
af45cd46eb Merge changes from topic "am-6459b40aaee14eccad6ccceaf3ffb2fe" into tm-qpr-dev-plus-aosp am: 439ca75c0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984486

Change-Id: I2a1c42f0bf75ab06b22f63967efbd66b88fff0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:57:06 +00:00
TreeHugger Robot
e872618555 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours am: 3f614f5c54 -s ours am: 7532227630 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b804d6cd85d260e5f4845d37191440d9fc21572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:56:51 +00:00
SongFerngWang
f09341c61d Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd am: 25818d1f60 am: 811ef31f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I3117f3334240a430acc5d0fc529802118dbcaf58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:54:51 +00:00
Aleksandar Kiridzic
31473663f5 speech: Add on-device speech recognition settings entry 
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
 2022-06-20 08:48:10 +00:00
Bill Yi
dec31c557c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours am: 96145d451d -s ours am: a98374b179 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01d20f7238c54c355a61e579efd19921d4138f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:48:00 +00:00
TreeHugger Robot
53561dc427 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours am: dcdc9374ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14da9af6e698621d5a887cedb6e2f861b531b35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:44:07 +00:00
Bill Yi
509791ae49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours am: 2c0551238e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia47555da1861a7f79895a25edb8abe89e7f1d5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:43:44 +00:00
Bill Yi
906a5ded3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: d32b801680 -s ours am: 81a60e63a6 -s ours am: 206755714e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bf4119e8cd6d778c97e73f3b9412a4dcafa62c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:41:31 +00:00
Bill Yi
4e75fe4146 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours am: b48231e5a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10d8b09e14e0b7e481b872b66c6485b5be65377f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:40:09 +00:00
Bill Yi
251a3f5db7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours am: 30583caa75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaedcc376193a9af6b705b1d4c161ec69efb6db85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:35:23 +00:00
Automerger Merge Worker
439ca75c0c Merge changes from topic "am-6459b40aaee14eccad6ccceaf3ffb2fe" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours am: 3f614f5c54 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours am: ad1e8e9f68 -s ours
 2022-06-20 08:35:01 +00:00
Automerger Merge Worker
1ff61a2635 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours" into tm-d1-dev-plus-aosp am: 1431470bdb -s ours am: 56b3570996 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bcaa06199b0bb1c0daec5a3be14ee7599f6aab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:34:25 +00:00
SongFerngWang
811ef31f4c Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd am: 25818d1f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I7de6b758ced067e04a9fce9a4c5ff3dbfa2c27eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:34:17 +00:00
Bill Yi
b42c35bba0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours am: 53100dbc0b -s ours am: 8e9beb7104 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86aab374fded4137aa930ca7d435853f682ce8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:34:12 +00:00
TreeHugger Robot
7532227630 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours am: 3f614f5c54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If830983086bca7b92b248361eb9d7f3e06a26eba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:33:34 +00:00
Bill Yi
d4a6d484f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours am: ad1e8e9f68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9a56ee3ea0cb7899496efbe18a3972e59617b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:33:13 +00:00
Bill Yi
a98374b179 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours am: 96145d451d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic26f64d204bf8b2eebdcbe061b280413cb7a6f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:28:05 +00:00
Bill Yi
edf92197b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 12d891d823 -s ours am: 9d8b5bae6b -s ours am: fe4e4bfa73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4151d682d15297e1698b1aa81bd14d7c6e0c100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:26:39 +00:00
Bill Yi
206755714e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: d32b801680 -s ours am: 81a60e63a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3d253681d66d626d2d2c6fed4a82f8c34fcb37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:25:57 +00:00
SongFerngWang
8584c75113 Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd am: 30b7bef042 am: 73e984bfa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I231826c0c460f7c0b5aa717c30bc7764f00b7e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:25 +00:00
SongFerngWang
098618d19b Fix the NullPointException am: 5a4df243f0 am: fd583a0459 am: 4f17ad5140 am: e5e39d8d07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Icdeef1cd8e3e97f97c810b8621930f794df81e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:24:16 +00:00
Automerger Merge Worker
56b3570996 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours" into tm-d1-dev-plus-aosp am: 1431470bdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I604ad55a999e75f56872848b19052b4e7a9941e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:23:05 +00:00
Bill Yi
8e9beb7104 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours am: 53100dbc0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31f348f2e3952c22c1c375d24433f91ed95519b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:22:42 +00:00
TreeHugger Robot
dcdc9374ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09456fa6dee64a6f453073956ff4370ecd8e80e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:20:25 +00:00
TreeHugger Robot
3f614f5c54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e9421a0dd7805e415d87a484c5080e4f118542c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:20:09 +00:00
Bill Yi
2c0551238e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I798cd5cea1e4efb86f72ef6a23195212c5a685c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:20:02 +00:00
Bill Yi
ad1e8e9f68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6953c85f2af7cc87468901268c8287083cd58b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:19:36 +00:00
Bill Yi
fe4e4bfa73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 12d891d823 -s ours am: 9d8b5bae6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I676772b97e77e7c1fae7df5430df8f27ab236ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:17:46 +00:00
Bill Yi
0c70b06256 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 7c822b7534 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea124d3b1adde599d58b6bb8390ed32d13751230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:16:11 +00:00
SongFerngWang
73e984bfa8 Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd am: 30b7bef042 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Ieb15b510b561b5861fa9b3dc17856b8a2b3b1bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:15:38 +00:00
SongFerngWang
e5e39d8d07 Fix the NullPointException am: 5a4df243f0 am: fd583a0459 am: 4f17ad5140 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: Id7bcf5ea19e7cff695d42eaff1d9d1ff16fe67a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:15:31 +00:00
Automerger Merge Worker
2f4ded87a2 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc8d8e568a -s ours am: a0abf344e5 -s ours" 2022-06-20 08:14:30 +00:00
Bill Yi
b48231e5a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77d565fae6e8ddac19bf836248dd878e9692f275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:14:02 +00:00
Bill Yi
96145d451d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: 85204b39fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad29b8eec2fb502d809293de0dda1b93b06262ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:13:07 +00:00
Bill Yi
81a60e63a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f -s ours am: 4066539cc9 -s ours am: d32b801680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib153751687b7a738ee48112eb6e41059730e4a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:11:29 +00:00
Automerger Merge Worker
1431470bdb Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours" into tm-d1-dev-plus-aosp 2022-06-20 08:11:02 +00:00
Bill Yi
53100dbc0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55a5cfc8ee7beac3b81268ef88252961abeb3675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:09:27 +00:00
Bill Yi
30583caa75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 3caf5ab605 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cecef72695311a23909ab4945d7e451352c699b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:08:06 +00:00
Bill Yi
9d8b5bae6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d -s ours am: 12d891d823 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42a13822784c9477c351105c7eae9327609be96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:07:58 +00:00
Bill Yi
7062d08e32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc8d8e568a -s ours am: a0abf344e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5891cd8459fa3999c7932fe275ecc7e46ca77391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:07:14 +00:00
SongFerngWang
30b7bef042 Fix the NullPointException am: 5a4df243f0 am: 5221cb21bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

Change-Id: I6d673502a90eac66c9787c278f5893dbf88e7273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:06:53 +00:00
SongFerngWang
4f17ad5140 Fix the NullPointException am: 5a4df243f0 am: fd583a0459 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546

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