TreeHugger Robot
c1683405f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c0935683da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12464526
Change-Id: Ia79f67e9637aaeebe4bff202e037fca6b9e7c797
2020-08-27 07:08:08 +00:00
TreeHugger Robot
8f7d28eadc
Merge "Replaced calls to UserManager.getUsers(true) to UserManger.getAliveUsers()" am: 2c6dfc2273
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363016
Change-Id: I7f2353fd97b5b3f1fb0f8b701437b271fab160a2
2020-08-27 06:59:35 +00:00
TreeHugger Robot
c0935683da
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-08-27 00:39:34 +00:00
Bill Yi
32fc7e3b9c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I279c1ec2e4ee0794e6c0895053a7d341011079e9
2020-08-26 22:33:29 +00:00
TreeHugger Robot
2c6dfc2273
Merge "Replaced calls to UserManager.getUsers(true) to UserManger.getAliveUsers()"
2020-08-26 21:02:06 +00:00
TreeHugger Robot
4aec562b3c
Merge "Show just disconnected device on previously connected" am: 3777d883a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369337
Change-Id: I44b5df624104df3a5bec7e88add764b6a578440e
2020-08-26 15:29:40 +00:00
TreeHugger Robot
3777d883a3
Merge "Show just disconnected device on previously connected"
2020-08-26 14:50:45 +00:00
Hugh Chen
386df49bbc
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
2020-08-26 18:56:30 +08:00
TreeHugger Robot
3a6a757816
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3
-s ours am: bc4f38d322
-s ours am: b96878a81a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12446577
Change-Id: I608765f1286196725bd9767821dfd8f50a9025d3
2020-08-26 04:27:14 +00:00
TreeHugger Robot
b96878a81a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3
-s ours am: bc4f38d322
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12446577
Change-Id: I5beec29a76bb3d19d9c6a2201b264a07f09c49c0
2020-08-26 04:12:39 +00:00
TreeHugger Robot
bc4f38d322
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12446577
Change-Id: I5cc5e7850459c371cbbc2ff65a3d4a13997fdeac
2020-08-26 03:53:39 +00:00
TreeHugger Robot
9a728641e3
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-26 03:02:50 +00:00
TreeHugger Robot
93c6ca914d
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92
am: 98dd4491b7
am: 9aaa4a65f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582
Change-Id: Ib8baa15a2e9a4edbf0b70f0decbea6746e8a0f7b
2020-08-25 19:53:43 +00:00
TreeHugger Robot
9aaa4a65f5
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92
am: 98dd4491b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582
Change-Id: I4b732b59e5c4446766bff1069907fccc568f6774
2020-08-25 19:13:44 +00:00
TreeHugger Robot
98dd4491b7
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582
Change-Id: I84db13dbe58d05cb8639515e302b927c00342662
2020-08-25 18:58:11 +00:00
TreeHugger Robot
794482fb92
Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev
2020-08-25 18:14:50 +00:00
Bill Yi
c451cf2466
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I671b84326cfd203176121627a567768f51f32524
2020-08-25 08:57:10 -07:00
Jeff DeCew
d03970def5
Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." am: 9e1d9c40d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401955
Change-Id: Ida5ea498ef49fd670da4c529ca8bf51faa65d7ce
2020-08-25 15:06:47 +00:00
Jeff DeCew
9e1d9c40d8
Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout."
2020-08-25 14:00:04 +00:00
TreeHugger Robot
58426af982
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 66f3b09eab
-s ours am: 887b09614d
-s ours am: 18eabc3c6f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: I899997435b75b33797fe44992a68736cb1357632
2020-08-25 02:33:00 +00:00
TreeHugger Robot
f335120e11
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 10dd2553f5
-s ours am: 2a5cdaa51b
-s ours am: 0a5fa3f003
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: I7a7c545cd1ca7df27f333e13375f051845d13ed1
2020-08-25 02:32:50 +00:00
TreeHugger Robot
1ffa4c2ba6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791
-s ours am: 5a3f9c7700
-s ours am: 265aacbd89
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437626
Change-Id: I0517db6ea8ff7abd600e451de76b228ae450147c
2020-08-25 02:31:54 +00:00
TreeHugger Robot
18eabc3c6f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 66f3b09eab
-s ours am: 887b09614d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: Ia463c1e0dc25c629d47a21e293ac90b969862cfc
2020-08-25 02:01:01 +00:00
TreeHugger Robot
0a5fa3f003
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 10dd2553f5
-s ours am: 2a5cdaa51b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: I10a44db8348cdce8839ade99d1d6e0b65ec3b586
2020-08-25 02:00:47 +00:00
TreeHugger Robot
265aacbd89
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791
-s ours am: 5a3f9c7700
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437626
Change-Id: I0ee9328094adbdec5da5db6378cb8cbee091ed42
2020-08-25 02:00:39 +00:00
TreeHugger Robot
887b09614d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 66f3b09eab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: I2ffcf3962bcc223d5ee056f8f2b3e8a47964ba70
2020-08-25 01:58:10 +00:00
TreeHugger Robot
2a5cdaa51b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours am: 10dd2553f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: If33ef43e82404e5fa5ae2a970d8e21d3b0fec7a3
2020-08-25 00:50:57 +00:00
TreeHugger Robot
66f3b09eab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: Ib5a7bb2bed92ff6a85e04007ed1ca44dfd87ef2a
2020-08-25 00:50:50 +00:00
TreeHugger Robot
5a3f9c7700
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437626
Change-Id: Ifab410adba669f1f5be3858cad4fb63c2245fa36
2020-08-25 00:50:46 +00:00
TreeHugger Robot
10dd2553f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12437272
Change-Id: Ie8e590ce674ad98870db8b7ec424e79aed1e5646
2020-08-25 00:50:44 +00:00
TreeHugger Robot
c134678791
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-08-24 23:59:52 +00:00
TreeHugger Robot
7784b632f0
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-24 23:47:22 +00:00
Bill Yi
74ebd8d67e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8de2117f17686fd3502158cac1256d604085650
2020-08-24 22:32:35 +00:00
Bill Yi
333af71c67
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I189c4535205aeb90f4804f8ce03125d2d0b57afc
2020-08-24 21:56:39 +00:00
TreeHugger Robot
564c69b1b4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: 12325057d4
-s ours am: 3426a65abb
-s ours am: 8ed8fc9940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: I78b0394814b24d59686a4b5945ac5d40d5c5e9d7
2020-08-24 21:49:52 +00:00
TreeHugger Robot
95e1fb722e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: ee6f51cc9e
-s ours am: 9c24ebe715
-s ours am: 70e852c0de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: I7db3c7158ccd70bcc74516884bde9744b6a6843a
2020-08-24 21:49:25 +00:00
TreeHugger Robot
8a3998b507
[automerger skipped] Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009
am: 6a23ee5d37
-s ours am: 92b9cd88e2
-s ours
...
am skip reason: Change-Id I4499a3639abab356e8faa6316bfa45541efd63ac with SHA-1 71a25ea64f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062
Change-Id: I0d2f269e092d5018053343d396bf8e7f7095f162
2020-08-24 21:49:15 +00:00
TreeHugger Robot
9a76d423d5
Merge "Update the description of swipe bottom to notificaton gesture" am: 1523c55d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12421902
Change-Id: I5068ffd2fb79b0b284604969c22ec1332a864d77
2020-08-24 21:40:07 +00:00
TreeHugger Robot
8ed8fc9940
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: 12325057d4
-s ours am: 3426a65abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: I75d73ae4f05eac1148cf0f3cca70a8adce70f047
2020-08-24 21:16:29 +00:00
TreeHugger Robot
70e852c0de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: ee6f51cc9e
-s ours am: 9c24ebe715
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: Ice11df50c27273f29af7bc7f2733d725a6fe857e
2020-08-24 21:14:48 +00:00
TreeHugger Robot
92b9cd88e2
[automerger skipped] Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009
am: 6a23ee5d37
-s ours
...
am skip reason: Change-Id I4499a3639abab356e8faa6316bfa45541efd63ac with SHA-1 71a25ea64f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062
Change-Id: Ib2a8e303776db54bf1bdd1742e978b9988802340
2020-08-24 21:14:27 +00:00
TreeHugger Robot
1523c55d83
Merge "Update the description of swipe bottom to notificaton gesture"
2020-08-24 20:29:43 +00:00
Jeff DeCew
b409b64045
Update NotificationChannelSettings Preferences in place to prevent re-layout.
...
Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
2020-08-24 15:11:22 -04:00
Julia Reynolds
47c1181a7e
Merge "Fix pending intent links" into rvc-qpr-dev am: 3e29b54e5a
am: aee17d0f0b
am: 8295294d24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416202
Change-Id: I4b56c2523f734af050701db43ed962f30ec78ab0
2020-08-24 18:28:43 +00:00
TreeHugger Robot
3426a65abb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: 12325057d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: I6d0d5fe4997843bed781a49ed49acb17e54be9f8
2020-08-24 18:27:45 +00:00
TreeHugger Robot
9c24ebe715
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours am: ee6f51cc9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: Id452ad22af18dbdecac8599b6b56b4806e64eab7
2020-08-24 18:19:02 +00:00
Julia Reynolds
8295294d24
Merge "Fix pending intent links" into rvc-qpr-dev am: 3e29b54e5a
am: aee17d0f0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416202
Change-Id: I985362c77782240bbe4c6f87ab32e046ef0bd56b
2020-08-24 17:31:16 +00:00
TreeHugger Robot
ee6f51cc9e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: Ie86707775f05944896f263c67f109faf4fba6dc4
2020-08-24 17:31:13 +00:00
TreeHugger Robot
12325057d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12434724
Change-Id: I30ace31758787b69746ce157fcea87836da0f8c0
2020-08-24 17:30:47 +00:00
TreeHugger Robot
fcfa016fc6
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev
2020-08-24 16:39:30 +00:00