Bonian Chen
3901996e1d
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: 710dfc1bec
...
Original change: undetermined
Change-Id: I79f8ad86b782ef1cf10b8a4e1ad7d5de779aaadb
2020-06-02 09:42:54 +00:00
Bonian Chen
27565c5f40
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0
...
Original change: undetermined
Change-Id: Icc9108b620e40439cde62110f69ebd1ee8670150
2020-06-02 09:42:53 +00:00
Bonian Chen
7f939d8d7e
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2 am: ae207e14c0
...
Original change: undetermined
Change-Id: I339dc5e8a2353e3b9338e8b37d0c4f6986216dd7
2020-06-02 09:42:13 +00:00
Bonian Chen
710dfc1bec
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2
...
Original change: undetermined
Change-Id: I4e88e7e2b9253b4b579a29c921c3259ad8ec680b
2020-06-02 09:29:29 +00:00
Bonian Chen
ae207e14c0
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev am: db6309cae2
...
Original change: undetermined
Change-Id: I92c00ccaca975dec09b57afbabdadffc26bbd355
2020-06-02 09:29:13 +00:00
Bonian Chen
db6309cae2
Merge "[Settings] Avoid crash when switch SIM during PIN lock" into rvc-dev
2020-06-02 09:19:00 +00:00
Bonian Chen
d40f7f707e
[Settings] Move mobile data template out of framework
...
Move mobile data template out of framework
Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageLibTest
Change-Id: I5072cd1e673194d00b3ce82242bf5fbad88d23cd
2020-06-02 17:16:53 +08:00
Automerger Merge Worker
21673c9cde
Merge "Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 660021fec1" into rvc-qpr-dev-plus-aosp am: 6bf2b9fbe5 am: efcc0b79ec
...
Original change: undetermined
Change-Id: Ifa950b194d29521b639fb576040f7c212d5e754f
2020-06-02 08:28:17 +00:00
TreeHugger Robot
ce38d19cef
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: 74236c50a0 am: 76bff39d89 am: 9ad2871778 am: 22d734f069
...
Original change: undetermined
Change-Id: I327f476f3aa9ddf157deaa39e535818f74818626
2020-06-02 08:28:10 +00:00
TreeHugger Robot
b89584b393
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 2ba19aba50 am: 64c98414af am: f42a7a56d9
...
Original change: undetermined
Change-Id: Ia78ccaec5fa24a10acb382ff04be2afd6450c11a
2020-06-02 08:28:04 +00:00
Automerger Merge Worker
efcc0b79ec
Merge "Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 660021fec1" into rvc-qpr-dev-plus-aosp am: 6bf2b9fbe5
...
Original change: undetermined
Change-Id: I626e386950feda8e8f15845e8808ec7fee1ef100
2020-06-02 08:13:54 +00:00
TreeHugger Robot
22d734f069
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: 74236c50a0 am: 76bff39d89 am: 9ad2871778
...
Original change: undetermined
Change-Id: I9212662288b677aa013f6ecfa666c0e6ba05169c
2020-06-02 08:13:45 +00:00
TreeHugger Robot
f42a7a56d9
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 2ba19aba50 am: 64c98414af
...
Original change: undetermined
Change-Id: I6f9d3da311659d8f3e8c9345b0e8aa99c393952b
2020-06-02 08:13:37 +00:00
Automerger Merge Worker
e03a8edfcd
Merge "Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08" into rvc-qpr-dev-plus-aosp am: a79a396077 am: 4cde7596fc
...
Original change: undetermined
Change-Id: Ie4e09eaba7be44703514711981c91fc4fa6bcad1
2020-06-02 08:09:02 +00:00
TreeHugger Robot
8316337a4c
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 723aeb0372 am: 7c99712340 am: 76e1f83639
...
Original change: undetermined
Change-Id: Icc49b1280d550401669b1aa69762e4641727de44
2020-06-02 08:08:39 +00:00
TreeHugger Robot
96bc33ee35
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 0ee853f913 am: dca77b296a am: d22f3e00b5
...
Original change: undetermined
Change-Id: Ie81bbe35e8ba1885f8de316f783f4e0de8b733b0
2020-06-02 08:07:43 +00:00
Automerger Merge Worker
6bf2b9fbe5
Merge "Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 660021fec1" into rvc-qpr-dev-plus-aosp
2020-06-02 07:58:47 +00:00
TreeHugger Robot
ce3f8db32f
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 660021fec1
...
Original change: undetermined
Change-Id: I8162cd61f570229e38791ab5749e52d454dbf469
2020-06-02 07:58:43 +00:00
TreeHugger Robot
9ad2871778
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: 74236c50a0 am: 76bff39d89
...
Original change: undetermined
Change-Id: I7d7c558977c29a5497141d119e24a512cb23f91e
2020-06-02 07:58:39 +00:00
TreeHugger Robot
64c98414af
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762 am: 2ba19aba50
...
Original change: undetermined
Change-Id: If5ba267136bfcd59c85844149773898ebb8569fc
2020-06-02 07:58:32 +00:00
Automerger Merge Worker
4cde7596fc
Merge "Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08" into rvc-qpr-dev-plus-aosp am: a79a396077
...
Original change: undetermined
Change-Id: I3840b9c2df9d4efabde0072e073f91f314805920
2020-06-02 07:54:29 +00:00
TreeHugger Robot
76e1f83639
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 723aeb0372 am: 7c99712340
...
Original change: undetermined
Change-Id: Ie976a051bf2a18dc9a7f5aa446bc2b46f3ce5770
2020-06-02 07:54:00 +00:00
TreeHugger Robot
76bff39d89
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: 74236c50a0
...
Original change: undetermined
Change-Id: I2bce7b18502deffcad70361de7353d064657c4a3
2020-06-02 07:53:42 +00:00
TreeHugger Robot
d22f3e00b5
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 0ee853f913 am: dca77b296a
...
Original change: undetermined
Change-Id: I3facd684220dc4de38c9bbe4f86a1e584b84f74e
2020-06-02 07:53:09 +00:00
TreeHugger Robot
660021fec1
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762
...
Original change: undetermined
Change-Id: I45901cb1a991dfb65f4406b48a88506941ac44e4
2020-06-02 07:46:52 +00:00
TreeHugger Robot
2ba19aba50
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd am: b607801762
...
Original change: undetermined
Change-Id: I48fc5689d72f9ea304b19286755a84997cdd8ee1
2020-06-02 07:46:50 +00:00
Automerger Merge Worker
a79a396077
Merge "Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08" into rvc-qpr-dev-plus-aosp
2020-06-02 07:40:57 +00:00
TreeHugger Robot
119a601a84
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a am: 0add12ea08
...
Original change: undetermined
Change-Id: I9579d362ed06d64949472e7b86193e0fea6ac0ac
2020-06-02 07:40:52 +00:00
TreeHugger Robot
7c99712340
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 723aeb0372
...
Original change: undetermined
Change-Id: Ie6dfb2bab7dd0d048f5692ade7e35b9ca1b70490
2020-06-02 07:40:50 +00:00
TreeHugger Robot
dca77b296a
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331 am: 0ee853f913
...
Original change: undetermined
Change-Id: Id668ed7383cd23220d19fef5576b33c7d5d91ecc
2020-06-02 07:40:03 +00:00
TreeHugger Robot
74236c50a0
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd
...
Original change: undetermined
Change-Id: If792feed3581c2224c036f02f4838254978e4807
2020-06-02 07:34:27 +00:00
TreeHugger Robot
b607801762
Merge "Suppress battery saver suggestion notification" into rvc-dev am: 62ec08f7bd
...
Original change: undetermined
Change-Id: I33a30ec63b81285b76f07f51c4b139198fe24320
2020-06-02 07:33:43 +00:00
TreeHugger Robot
0add12ea08
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: d73d9d616a
...
Original change: undetermined
Change-Id: I6a8b45fce1f7ab596648d50ba44395b05791e6ec
2020-06-02 07:22:37 +00:00
TreeHugger Robot
0ee853f913
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331
...
Original change: undetermined
Change-Id: Ieb42225de9670cef1a4436993112bb4e33ee5cb0
2020-06-02 07:22:18 +00:00
TreeHugger Robot
723aeb0372
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331
...
Original change: undetermined
Change-Id: I00edcd1c5f37c99b1e6cb8ce1022f4635ac8d78e
2020-06-02 07:22:16 +00:00
TreeHugger Robot
62ec08f7bd
Merge "Suppress battery saver suggestion notification" into rvc-dev
2020-06-02 07:18:54 +00:00
TreeHugger Robot
d73d9d616a
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0
...
Original change: undetermined
Change-Id: I75084fc3e3e8828a19eb2f0f68d83d3479258715
2020-06-02 07:08:57 +00:00
TreeHugger Robot
b05ab42331
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0
...
Original change: undetermined
Change-Id: I2ff9f2d9ee2e33bb41bc5bfd43aee1153b819ee8
2020-06-02 07:08:10 +00:00
TreeHugger Robot
8ab31819e0
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev
2020-06-02 06:58:26 +00:00
Automerger Merge Worker
27aec30819
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp am: 927dde84dc am: abb6196e97 am: f42be40a11
...
Original change: undetermined
Change-Id: I355575efc28c2424fcc6a20acd2a9d0071af98fb
2020-06-02 06:17:12 +00:00
TreeHugger Robot
b86e9d4a6a
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 5a26d93586 am: 5b24a76730 am: 1368e2f2b1 am: 21c70dcae2
...
Original change: undetermined
Change-Id: I64862f5cfe43ac21a54bf043eb10af2642a62121
2020-06-02 06:16:49 +00:00
TreeHugger Robot
cabb67221c
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97 am: 6860c7a713 am: d2cce375da am: 2f47f21f00
...
Original change: undetermined
Change-Id: I02fc904c36b2a6587db5155c47bd968371dc6f91
2020-06-02 06:16:06 +00:00
Automerger Merge Worker
f42be40a11
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp am: 927dde84dc am: abb6196e97
...
Original change: undetermined
Change-Id: I4f175a8eb437050adb5e1889f519e27a3da49488
2020-06-02 06:00:49 +00:00
TreeHugger Robot
21c70dcae2
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 5a26d93586 am: 5b24a76730 am: 1368e2f2b1
...
Original change: undetermined
Change-Id: Ia0307c19991484dd0d94d60da0227f8131f8383b
2020-06-02 06:00:03 +00:00
TreeHugger Robot
2f47f21f00
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97 am: 6860c7a713 am: d2cce375da
...
Original change: undetermined
Change-Id: I8573bb60464ff233e93a5e8fabe8cb74fc2424ee
2020-06-02 05:59:12 +00:00
Mill Chen
418c85f139
Suppress battery saver suggestion notification
...
When users turn on battery saver manually more than 3 times, the "Tap to
schedule Battery Saver" notification will suggest users to enable
scheduling battery saver. But this notification is still shown if users
have already turned on scheduling battery saver, which is caused by no
mechanism to suppress this notification.
Solution:
Adding a mechanism to suppress battery saver suggestion if users
scheduled battery saver.
Bug: 147862112
Test: robotests
Change-Id: I8290d76dac09104e64fb98b8a9f4d783a8177d7c
2020-06-02 13:50:48 +08:00
Automerger Merge Worker
abb6196e97
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp am: 927dde84dc
...
Original change: undetermined
Change-Id: I415a3591e7ed7e6b2abb84feb7042fd013d5f151
2020-06-02 05:47:45 +00:00
TreeHugger Robot
1368e2f2b1
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 5a26d93586 am: 5b24a76730
...
Original change: undetermined
Change-Id: I055d5bbdd4dcb93ef0eada9aa23099d0fea7212b
2020-06-02 05:47:12 +00:00
TreeHugger Robot
d2cce375da
Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97 am: 6860c7a713
...
Original change: undetermined
Change-Id: Ieb850c029053037602e9dabed815a765486cefe2
2020-06-02 05:46:56 +00:00
Automerger Merge Worker
927dde84dc
Merge "Merge "Fix contextual card robotests." into rvc-dev am: 55b7890150 am: 193c30ae97" into rvc-d1-dev-plus-aosp
2020-06-02 05:34:46 +00:00
