Bill Yi
28825ad9e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
2020-09-09 13:56:30 +00:00
Xin Li
f82ee6a5d3
Merge Android R
...
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
2020-09-08 16:56:07 -07:00
Hugh Chen
194dd88e7d
Fix settings crash
...
- This CL before, "Previously connected device" didn't
handle dock device. If user have disconnected dock
device will cause Settings crash.
This CL add condition to handle dock device to avoid crash.
- Update test case.
Bug: 157653997
Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
Merged-In: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
2020-09-07 02:59:15 +00:00
Hugh Chen
cb057d6e9e
Show just disconnected device on previously connected
...
- This CL before, previously connected devices will show most
recently connected devices and the maximum is 3.
In this time, if next most recently connected device is disconnected.
It's will not show on "previously connected devices", user needs go to
"see all" page to found that device.
This CL add rule to compare the priority of most recently connected
device. If priority of next disconnected device is higher than
currnect devices that on "previously connected devices".
Let next disconnected device show on "previously connected devices".
- Update test case.
Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
Merged-In: I684501a20a67755b2196ba9d4b5565add01a5d01
2020-09-07 02:59:06 +00:00
Hugh Chen
30a97a9cc5
Display "see all" option when bluetooth is off
...
- This CL before, Bluetooth settings will hide the "see all"
option when bluetooth is off. For the UX improvement, this
CL will show the "see all" button when bluetooth is off. And
turn on the BT when user press "see all" button to let user to
quick pair their disconnected devices.
- Update and add test case
Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
Merged-In: I7a1451a36a31253b6be2203341bea4e59fed7c2b
(cherry picked from commit bde100849e
)
2020-09-07 02:58:39 +00:00
Bill Yi
089ac7f7d2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: de28bc7c7e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I27f9496735033b8b7d8666ceb7a66e4abeaec921
2020-09-06 20:06:51 +00:00
Bill Yi
6746ecb1c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015
Change-Id: Iade07158a0cb1462fbe74bfa0a8875179bc5d8bf
2020-09-06 20:06:46 +00:00
Bill Yi
13281b0aeb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours am: 3f9c81573d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I57d32cce1ab7cb2a9acd576b1564c5dcc8c31777
2020-09-06 20:06:03 +00:00
Bill Yi
de28bc7c7e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I027479bbfa400ad6bb51b1a64d8b70e0dfb68800
2020-09-06 19:52:48 +00:00
Bill Yi
3f9c81573d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014
Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
2020-09-06 19:52:05 +00:00
Bill Yi
d9a2be8b1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf95416dc8ce50515dd6763c3ae24ebf89722c6a
2020-09-06 13:05:51 +00:00
Bill Yi
ee8c3875ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
2020-09-06 12:31:40 +00:00
Treehugger Robot
002c5b1143
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours am: 8b2080e7cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I69831a3612d01d0447f5a75426cce5b6f2f846a6
2020-09-05 19:43:50 +00:00
Treehugger Robot
8b2080e7cc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours am: f75d48d9f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours am: ada75ad54d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393
Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 18:32:54 +00:00
Treehugger Robot
f85d3b3f5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours am: 966f8a889b
-s ours am: 3867542239
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I0e2e4d7c4fbab1d836706528b665b2db9d21cf21
2020-09-05 15:29:00 +00:00
Treehugger Robot
a2329d7450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours am: 2d241c544d
-s ours am: 52b60555b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: I4f9a4a3b1daa382df98a7e59d99137767835c2a2
2020-09-05 15:28:54 +00:00
Treehugger Robot
9e06009c51
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours am: d1b40cfb18
-s ours am: 701ea4dff8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I29b4a1f22c5f3b566d49c5d3e2ac263edf31348e
2020-09-05 15:28:35 +00:00
Treehugger Robot
3867542239
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours am: 966f8a889b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I5eed324de754c4ab34a26002ce1ca122dde916f0
2020-09-05 15:17:20 +00:00
Treehugger Robot
52b60555b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours am: 2d241c544d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: I044f323df73102f23202d6d2b3e70333fa2ef6d4
2020-09-05 15:17:13 +00:00
Treehugger Robot
701ea4dff8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours am: d1b40cfb18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I1b8b1e30adb80b033f5491a099e257fc522434ee
2020-09-05 15:17:00 +00:00
Treehugger Robot
966f8a889b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours am: 0749b2e5b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
2020-09-05 15:02:28 +00:00
Treehugger Robot
2d241c544d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours am: a4bfe8a50f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: Id8aea55919ca80fb40dc091d3325889f08fbc926
2020-09-05 15:02:22 +00:00
Treehugger Robot
d1b40cfb18
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours am: 809f01fc74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I55ff3c61ba1febe39d468c0a59cd558dd08ed677
2020-09-05 15:02:05 +00:00
Treehugger Robot
0749b2e5b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390
Change-Id: I4918d11aef9655cc94daaefdbc2c6400823beaa9
2020-09-05 14:26:56 +00:00
Treehugger Robot
a4bfe8a50f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392
Change-Id: Ib43bd3e6188189f638e1c583907708eeb270f5df
2020-09-05 14:26:49 +00:00
Treehugger Robot
809f01fc74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389
Change-Id: I2087ff5e1201a5024e7f6948976e073e1f68312f
2020-09-05 14:26:25 +00:00
Treehugger Robot
e30450cd68
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-05 13:51:43 +00:00
Bill Yi
af59e5d24f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a59656075c476e775ad386c0f6169b565ad3586
2020-09-05 13:15:50 +00:00
Bill Yi
821f954a9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
2020-09-05 01:26:27 -07:00
TreeHugger Robot
983b31be76
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours am: 444c856107
-s ours am: 9a474ea6e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888
Change-Id: I61509e10e61424b2ae90d222d64eadf599ef3dc7
2020-09-02 19:04:07 +00:00
TreeHugger Robot
9a474ea6e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours am: 444c856107
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888
Change-Id: I0a69909d3fdef7b4d95d74f1958ef76ae6e5003e
2020-09-02 18:34:40 +00:00
TreeHugger Robot
444c856107
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888
Change-Id: If3b574996dcfa6bce46af7187589ddb254bfa807
2020-09-02 18:05:38 +00:00
TreeHugger Robot
11304fb8a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 17:50:47 +00:00
TreeHugger Robot
f87d5f6fc4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours am: bc565bd615
-s ours am: 7d16f97c97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: Id4da800bc0c5bd6b012a8b5e7e272918b2f879c7
2020-09-02 17:50:38 +00:00
TreeHugger Robot
7d16f97c97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours am: bc565bd615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I79f5560d71e8830e434458ce0f70858c6e3935fb
2020-09-02 17:49:23 +00:00
TreeHugger Robot
2461dfd8a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours am: edb75a2eec
-s ours am: 4a3e39cb13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: If9082b0f69fb2eed9a93d1ba2b166d8f88614078
2020-09-02 17:49:20 +00:00
TreeHugger Robot
bc565bd615
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886
Change-Id: I1895d604f90e4f8d497c7d9dee89463efd531bda
2020-09-02 17:12:25 +00:00
Anton Hansson
607d986e5e
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours am: 0df917748c
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: Ifbbef7c60d34d86538fb65aad2aed3b2c7b3bdca
2020-09-02 17:11:38 +00:00
TreeHugger Robot
4a3e39cb13
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours am: edb75a2eec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I0ec0fe0fa16a7ea6dd2768e16dc5b4c3f8a753f2
2020-09-02 16:36:19 +00:00
Anton Hansson
0df917748c
[automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4
-s ours am: 633379f309
-s ours
...
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12508095
Change-Id: I861f802d5fef4c3ca7be53e9d1162c6482312324
2020-09-02 16:34:49 +00:00
TreeHugger Robot
74ab66f631
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:31:43 +00:00
TreeHugger Robot
edb75a2eec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887
Change-Id: I3fcb638648ca92b1b363b77cc8ae4a04ea6268e2
2020-09-02 16:11:19 +00:00
TreeHugger Robot
11fd725f1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2020-09-02 16:06:50 +00:00