Menghan Li
a4036a28f0
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 am: 3cb796ad72 am: c0b28bb238
...
Change-Id: I1a7c00cb8a9404d6442255e6fd62907e3877be55
2020-04-14 23:26:13 +00:00
Menghan Li
38713ec80a
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: d88487448d am: 46a3fa93a8
...
Change-Id: I719edafbf7a8527ee0efddcc4146631094cb4356
2020-04-14 23:26:02 +00:00
Menghan Li
c0b28bb238
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09 am: 3cb796ad72
...
Change-Id: Icecd94ecdaa7d0220ddd0ffe4a63b3439abbadb3
2020-04-14 23:04:03 +00:00
Menghan Li
46a3fa93a8
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: d88487448d
...
Change-Id: I99fc391c91464c7496386cfb6f92dda932178ba6
2020-04-14 23:03:57 +00:00
Menghan Li
e36a45ebce
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb am: 4a7387d0b2
...
Change-Id: I455eccb65b7b7da52ed0d48a1ec57a71ab279cc6
2020-04-14 23:03:47 +00:00
Menghan Li
3cb796ad72
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: 702e607c09
...
Change-Id: Id921d9ea3ad24c3b4d8edac0165b16034c5b715d
2020-04-14 22:56:33 +00:00
Menghan Li
4a7387d0b2
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb
...
Change-Id: Ib9b32d8b0ca947af798fad8159e2773e277eb9e1
2020-04-14 22:45:15 +00:00
Menghan Li
d88487448d
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9 am: a8d035b6fb
...
Change-Id: Ib0fe68aed2175bbc03e1a7e20f9fab6d3e602c4b
2020-04-14 22:43:46 +00:00
Menghan Li
702e607c09
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9
...
Change-Id: I5032dee01f02bb6f4f1a4ffbca43550c0556ffbf
2020-04-14 22:34:26 +00:00
Menghan Li
a8d035b6fb
Merge "Fine tune the maganication area edit dialog" into rvc-dev am: b5a0ff7ee9
...
Change-Id: Ica23de459026f96284bd05806fb41bc10fbe4c19
2020-04-14 22:32:56 +00:00
Menghan Li
b5a0ff7ee9
Merge "Fine tune the maganication area edit dialog" into rvc-dev
2020-04-14 22:12:46 +00:00
TreeHugger Robot
ef54fabf0e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 42aacf05dc -s ours am: 087616e36f -s ours am: bb69ae06a2 -s ours am: 2432b624c3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I75672aa02a52e56e6429843932a915889a60fa3e
2020-04-14 18:51:13 +00:00
TreeHugger Robot
38803830de
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: f513fee9b1 -s ours am: e2a07ad5e1 -s ours am: a12990d504 -s ours am: 3126978682 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I13de5b92cfdec02dde6dfae3397189527e79f99f
2020-04-14 18:50:40 +00:00
TreeHugger Robot
8659f59e42
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours am: 32c9343e9f -s ours am: d427a2e9d1 -s ours am: 2524e45b38 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7dc77d57927fa8cb758fe0b3b8f1ba322c81aef5
2020-04-14 18:50:18 +00:00
TreeHugger Robot
e8a4bd95a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: b383a523c7 -s ours am: 2dcf16dbb5 -s ours am: 0b9ebc1be5 -s ours am: 4027c4e778 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I48d2e1c0d4f91e3b7b45df2cab141577a5d9179c
2020-04-14 18:49:29 +00:00
TreeHugger Robot
d4867fc268
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 86c47713b0 -s ours am: 19871e51a6 -s ours am: 802b2fbaa5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id1a13ca7c5161c17af740955bdc2661892268a6c
2020-04-14 18:48:03 +00:00
TreeHugger Robot
a865c99b79
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: 0f16c8c93d -s ours am: bf6c4f7030 -s ours am: debeb1a699 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I194d4ff4aee6162a311fce3d5d06cd81defae3f4
2020-04-14 18:39:50 +00:00
TreeHugger Robot
2432b624c3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 42aacf05dc -s ours am: 087616e36f -s ours am: bb69ae06a2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I38bc8bf1f01728084a17ae3317f28c9a216712f0
2020-04-14 18:04:38 +00:00
TreeHugger Robot
3126978682
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: f513fee9b1 -s ours am: e2a07ad5e1 -s ours am: a12990d504 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If25097c259a20fc61d93b7d2dc9015971932e823
2020-04-14 18:03:36 +00:00
TreeHugger Robot
bb69ae06a2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 42aacf05dc -s ours am: 087616e36f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I04b33cbfa890a7a556bb8cc640854a720f894aae
2020-04-14 17:53:16 +00:00
TreeHugger Robot
a12990d504
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: f513fee9b1 -s ours am: e2a07ad5e1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I61358246cb5c285433c9eca9b8bf3d2906111ee0
2020-04-14 17:53:04 +00:00
TreeHugger Robot
2524e45b38
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours am: 32c9343e9f -s ours am: d427a2e9d1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id39e57d9a26cf3bcfbe38abd5b2460b5dfac3434
2020-04-14 17:52:34 +00:00
TreeHugger Robot
4027c4e778
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: b383a523c7 -s ours am: 2dcf16dbb5 -s ours am: 0b9ebc1be5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7b0ead8da763f7763bfd91f2d0b43f9ea889e732
2020-04-14 17:52:11 +00:00
TreeHugger Robot
802b2fbaa5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 86c47713b0 -s ours am: 19871e51a6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If0b8b9ac7d002a3952b04d4b55752f5b5b5526e3
2020-04-14 17:51:51 +00:00
TreeHugger Robot
debeb1a699
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: 0f16c8c93d -s ours am: bf6c4f7030 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I47e2e93317e4d813a43381a22f18b853e8150d2e
2020-04-14 17:51:20 +00:00
TreeHugger Robot
d427a2e9d1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours am: 32c9343e9f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0954843947315f01e3387282f76b647b28ffb11e
2020-04-14 17:33:08 +00:00
TreeHugger Robot
0b9ebc1be5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: b383a523c7 -s ours am: 2dcf16dbb5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5381df9f4e8e1f3a79a902b83703e5a7a223564e
2020-04-14 17:33:03 +00:00
TreeHugger Robot
19871e51a6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 86c47713b0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3cae3ebfc7e5c001461adf7284514a0d6429e97e
2020-04-14 17:32:57 +00:00
TreeHugger Robot
087616e36f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours am: 42aacf05dc -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3b7a418ce4adfc5d72a6cc5d9789535c3c0c898b
2020-04-14 17:32:16 +00:00
TreeHugger Robot
bf6c4f7030
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: 0f16c8c93d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I15763446adcc120a5017bddf05a4c966325cb0ec
2020-04-14 17:32:12 +00:00
TreeHugger Robot
e2a07ad5e1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours am: f513fee9b1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id44afb6aefcca246ace22db6a50f86e2d3c524b6
2020-04-14 17:31:52 +00:00
Julia Reynolds
1845421ef8
Update flows for notification history
...
- Remove settings observer, since the switch is right here
- Add 'notifications will soon appear' whenever history is empty
Test: manual
Fixes: 153677280
Fixes: 152578971
Change-Id: Ia372fafb3688fe7d45a7634e379f022bcffea169
2020-04-14 13:16:04 -04:00
TreeHugger Robot
32c9343e9f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: d95b9f059f -s ours
...
am skip reason: subject contains skip directive
Change-Id: I81dc7baa5b3220b142fcefba3822957c31e892bc
2020-04-14 17:14:15 +00:00
TreeHugger Robot
42aacf05dc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I413be9259b52715a58eb7505de1ffeefc021142a
2020-04-14 17:14:01 +00:00
TreeHugger Robot
2dcf16dbb5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: b383a523c7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3fc7df67891de4741c228073b5fd0b02988f3e9f
2020-04-14 17:13:59 +00:00
TreeHugger Robot
f513fee9b1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1ea10e73f7bd9dafb77b11f28a7844bd80de8a22
2020-04-14 17:13:46 +00:00
TreeHugger Robot
86c47713b0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours am: 8d9b3172c8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ied85b54fa14da4bf75f5fab830874730c4137b75
2020-04-14 17:12:31 +00:00
TreeHugger Robot
0f16c8c93d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours am: 55e3f34b5e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id6a385bc0e0e8a3f5cd2c2d2e4b39e6b4003a9ec
2020-04-14 17:12:19 +00:00
TreeHugger Robot
d95b9f059f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic5d1c3de7725e0ce628d965fb01abb42516839ce
2020-04-14 16:50:21 +00:00
TreeHugger Robot
b383a523c7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2312d37d3d18d6666e1effd5e9e90a89a35b4f39
2020-04-14 16:50:01 +00:00
TreeHugger Robot
8d9b3172c8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 60fd3c13ad -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id4cd0d448e621bde289b264d403e1d7ca3e80077
2020-04-14 16:49:06 +00:00
TreeHugger Robot
55e3f34b5e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6e84c65d49 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ida2c0804943b4be8a6409e9a93c8ededafa11c8d
2020-04-14 16:48:39 +00:00
TreeHugger Robot
60fd3c13ad
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-14 16:34:14 +00:00
TreeHugger Robot
6e84c65d49
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-14 16:26:21 +00:00
Daniel Chapin
77c41c1a5a
Revert "Don't write user_switcher_enabled value when enter this Settings"
...
This reverts commit 898d6b4d73
2020-04-14 15:47:48 +00:00
Julia Reynolds
47bb916e6c
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: d097110f43 am: 9f33509a9e am: 0acfb1cfb4 am: e081128e51
...
Change-Id: I5a8f3f2d06116568971c74b2c2a66bf7f8512edb
2020-04-14 12:29:59 +00:00
Julia Reynolds
bc1f5ec526
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: 93bc19e3a0 am: 00d5412626 am: cd1477ad07 am: cf63250d00
...
Change-Id: I17e4a702a4d6a5a1adc44bd3872a3900928e152d
2020-04-14 12:28:36 +00:00
Julia Reynolds
b0f1ae8335
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: e81fdf8011 am: 228048065f am: 3ef490189b
...
Change-Id: I6844765329770d779b5605bb3e6abb147cbe1b4b
2020-04-14 12:27:28 +00:00
Julia Reynolds
e081128e51
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: d097110f43 am: 9f33509a9e am: 0acfb1cfb4
...
Change-Id: Ib14654696afb36e554bdb0cec7e70383bfebe006
2020-04-14 12:24:09 +00:00
Julia Reynolds
0acfb1cfb4
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: d097110f43 am: 9f33509a9e
...
Change-Id: I4274b8eb43ebb008e894f7a696c05cf07d7c6610
2020-04-14 12:16:07 +00:00
