Commit Graph

112074 Commits

Author SHA1 Message Date
Bill Yi
0a91b64d97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: cedcc21b03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e91128d70043d027dfb1abf81c0e05f834f549d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:48:29 +00:00
Bill Yi
1c73653383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: d753deda12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie15e8dfadc34ebdee28720e5e5c18c376d2d4fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:48:27 +00:00
Bill Yi
80445edd03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: 85a4b5b105 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib9734ea1ba9af6b8a76d135df754f3af53cb102a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:48:21 +00:00
Bill Yi
bec60237b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: 3f823f660a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib85eb4c0123850334bb87382fd79c012fbe90cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:48:20 +00:00
TreeHugger Robot
16dfffd6e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: 16a6989a3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87d336c1f4b14eac5f6bfa2ee2988ad2228e9bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:41:24 +00:00
Bill Yi
bbce161bdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: 8c356181d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d7d19057d700661ce790325764843878686cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:41:16 +00:00
Bill Yi
22f8ed5745 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: ba3e9a0be7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic662f31c45b0a2c0fd5bb89b754e3dfe8c87a333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:41:09 +00:00
TreeHugger Robot
159ce975f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85265a3d481d97643770d3bac5a8e766809cb0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:40:03 +00:00
TreeHugger Robot
9ea3a54355 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: 16a6989a3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40c50c61a9e4ce33eb867899a4889dda6ed2fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:40:00 +00:00
Bill Yi
cedcc21b03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idaf6f1a8fe5ba4f96110c376a32c5564e7a01bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:56 +00:00
Bill Yi
3a2fbdc7da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: 8c356181d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I602d25b39aaf22343d1e83a6c15a828ce742bf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:53 +00:00
Bill Yi
85a4b5b105 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee82cadd6e1b26834e40662916f7e208b36843fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:49 +00:00
Bill Yi
414f01583d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: ba3e9a0be7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I196d973fb387245a7a1457027559e299385502db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:47 +00:00
TreeHugger Robot
c00d5a7f5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3dea3a493038f22ed97886bd0c25b6373777056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:20 +00:00
Bill Yi
d753deda12 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5f49d9c904c50b3b92e3892107b3617986ccb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:15 +00:00
Bill Yi
3f823f660a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c75de2e6515a2d7fe252960d660b1d1bc03c860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:39:06 +00:00
TreeHugger Robot
16a6989a3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id68dad65a41f070989c3af1eb9a771ac36694d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:23:39 +00:00
Bill Yi
8c356181d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7bc9900be8bff52607e50c04e5101bf155722e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:23:33 +00:00
Bill Yi
ba3e9a0be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib124601d7cf447559e33a4e6b863c0d6ad33aff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 16:23:24 +00:00
TreeHugger Robot
d9fba9380a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
Bill Yi
1cee81af88 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e0f4db7fa9
Blank merge reason: commit message contains skip directive

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

Change-Id: I465d26a4b5471daa9d6b564ada66764a92b6cbdb
2022-06-21 13:56:22 +00:00
Bill Yi
3431719904 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aec918fd54
Blank merge reason: commit message contains skip directive

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

Change-Id: I292533e214c07d5c385cdf639ba2d4e62284cd3f
2022-06-21 13:56:00 +00:00
Bill Yi
1b92a98891 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6239cc468a57eec0e714dab336bf2a913b54267e
2022-06-21 04:15:29 -07:00
Bill Yi
fabd8de898 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I99e5ebe3a8c58c3c9dd9ba74a3081aed861c859b
2022-06-21 04:11:01 -07:00
Bill Yi
e0f4db7fa9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2aff8ba61f93ad3faca8150efe2f588e51e5735
2022-06-21 04:07:41 -07:00
Bill Yi
aec918fd54 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6b3b59a119efaffac2323b7595e0b2107d9b445
2022-06-21 04:03:08 -07:00
Bill Yi
382bed292d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
2022-06-20 23:15:51 -07:00
Binyi Wu
57741ad29e Merge "Hide keyboard when user scroll through App search suggestions" 2022-06-21 05:21:41 +00:00
Bill Yi
e0bc0d2e1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 02c97733ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d6d1f0ebb9c9c17c3a33ef9d1abbe99fb5b1087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 02:49:40 +00:00
Bill Yi
765e9893e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ad6b3dc50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0426a96ccb0be5420793e8677fe2c0dca2af1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 02:49:30 +00:00
Binyi Wu
a62e8abcba Hide keyboard when user scroll through App search suggestions
Bug: 236037001
Test: manual
Change-Id: Ifdadc0a20f6ac4d658cea8ddca99044064d0d53f
2022-06-21 10:47:23 +08:00
Bill Yi
10392980a1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-06-21 02:32:14 +00:00
Bill Yi
02c97733ec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 02:31:30 +00: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
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