Lei Yu
2148c1a207
Merge "Fix issues in battery usage accounting" into qt-dev
2019-05-31 17:17:51 +00:00
Salvador Martinez
0213ca3583
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
am: ab5e939b72
...
am: 754416c28f
Change-Id: I7024b636826f915e83bf2cb14c6c84addd4ba24a
2019-05-31 09:58:50 -07:00
Salvador Martinez
412815e2b7
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
am: 154c485209
...
am: 1825608cde
Change-Id: I2ccf4ea47a87e16f0da8408d66ab372c4151abcc
2019-05-31 09:54:28 -07:00
Salvador Martinez
754416c28f
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: ab5e939b72
Change-Id: I0d10bdd2cc36b599ee9d932dafe20e6baef94b1d
2019-05-31 09:37:17 -07:00
Salvador Martinez
1825608cde
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: 154c485209
Change-Id: Id704c498feb80d8c66c472b08505dd492cbd708d
2019-05-31 09:32:26 -07:00
Salvador Martinez
ab5e939b72
Merge "Change switch text color to black in dark mode" into qt-dev
...
am: ccbdd834ff
Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
2019-05-31 09:16:12 -07:00
Salvador Martinez
154c485209
Merge "Change switch text color to black in dark mode" into qt-dev
...
am: ccbdd834ff
Change-Id: Ia64d44b5fd36823c1750ed8afc998f7619155824
2019-05-31 09:15:12 -07:00
TreeHugger Robot
ccbdd834ff
Merge "Change switch text color to black in dark mode" into qt-dev
2019-05-31 15:59:42 +00:00
Joel Galenson
2118f8a63f
Revert "Remove Permissions Hub."
...
This reverts commit 1e7c172ad5
.
Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
2019-05-31 07:55:19 -07:00
Julia Reynolds
210f0fef70
Merge "Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
am: 53bbf9b78d" into qt-r1-dev-plus-aosp
...
am: 409d8687d1
Change-Id: Idca81960cd2b22246afe4d197d906b69ab69699c
2019-05-31 06:42:56 -07:00
Julia Reynolds
dd806ce357
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
am: 760f617502
...
am: ef7ba1918a
Change-Id: I0478f3cbc6129a8674711bc2d717e7198557be52
2019-05-31 06:42:31 -07:00
Android Build Merger (Role)
409d8687d1
Merge "Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
am: 53bbf9b78d" into qt-r1-dev-plus-aosp
2019-05-31 13:37:39 +00:00
Julia Reynolds
21a9e1c43f
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
...
am: 53bbf9b78d
Change-Id: I4766ad312a9bb06c66ccc74e25ebd141fd7db7b1
2019-05-31 06:37:30 -07:00
Julia Reynolds
ef7ba1918a
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
...
am: 760f617502
Change-Id: I2b5f4e74eb601a78c7944cfb5e31b333c8c707bf
2019-05-31 06:37:28 -07:00
Julia Reynolds
760f617502
Merge "Reorder notification settings" into qt-dev
...
am: 1abcbaa093
Change-Id: I083414ad1486c393a89622a9d61f4dc8a9703e85
2019-05-31 06:32:30 -07:00
Julia Reynolds
53bbf9b78d
Merge "Reorder notification settings" into qt-dev
...
am: 1abcbaa093
Change-Id: I0e6baba13bfeeee2bdb78b1eeb68f484e5c94b78
2019-05-31 06:32:29 -07:00
TreeHugger Robot
1abcbaa093
Merge "Reorder notification settings" into qt-dev
2019-05-31 13:24:17 +00:00
Julia Reynolds
e3da5c15a4
Update notification settings animation
...
Test: manual
Fixes: 133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d
2019-05-31 09:18:42 -04:00
Joel Galenson
1884a64d0a
Merge "Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: d8efe209f7" into qt-r1-dev-plus-aosp
...
am: 6b0da3c2af
Change-Id: Ia8bb00f368a78471bf113d0c0d69e9791fb8082c
2019-05-31 06:18:22 -07:00
Joel Galenson
5a9c0f861e
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: 58246f66db
...
am: 0709624634
Change-Id: I9ebf8ab89c1bd7cdbb0f46df75cd842dc50a3bee
2019-05-31 06:17:32 -07:00
Android Build Merger (Role)
6b0da3c2af
Merge "Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: d8efe209f7" into qt-r1-dev-plus-aosp
2019-05-31 13:12:50 +00:00
Joel Galenson
0709624634
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
4e6553d435
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: d8efe209f7
Change-Id: I74cc8a834e40712dfc30e57768a7a603cd6bb5b6
2019-05-31 06:12:27 -07:00
Kevin Yao
4594c51be0
Fix typo for Accessibility permission dialog
...
Bug: 133362697
Test: Visual
Change-Id: I9dfe9218c1b41cf02257bbfdbe3128f952a9a97c
2019-05-31 21:08:37 +08:00
Joel Galenson
d8efe209f7
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
zoey chen
3aa9c79341
UE showed wrong title and message when enabling data roaming.
...
It set wrong string when building the roaming dialog.
BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Lucas Dupin
ff5dde9f05
Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32
...
am: d3e686fc33
Change-Id: I067abe881c9ac0f511cf184343c12a6ac74d1e9d
2019-05-30 21:33:17 -07:00
TreeHugger Robot
c0fbb533d2
Merge "Guard NPE when using search view"
2019-05-31 04:27:43 +00:00
Lucas Dupin
d3e686fc33
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
Change-Id: I8c0512ac98aecfb3306ee89e3a4ff1e711f45d89
2019-05-30 21:27:15 -07:00
TreeHugger Robot
1a3112ab32
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
2019-05-31 04:15:54 +00:00
Colin Cross
dc67600f18
Merge "Make test_options.timeout an int64" am: c56651b345
am: 001b1c556d
am: 2d7cf1d924
...
am: cde28793cd
Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd
Merge "Make test_options.timeout an int64" am: c56651b345
am: 001b1c556d
...
am: 2d7cf1d924
Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924
Merge "Make test_options.timeout an int64" am: c56651b345
...
am: 001b1c556d
Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
2019-05-30 20:24:25 -07:00
Colin Cross
001b1c556d
Merge "Make test_options.timeout an int64"
...
am: c56651b345
Change-Id: If57d4ce65e9e55e89c6e41376b1fa08447062666
2019-05-30 20:19:07 -07:00
Colin Cross
c56651b345
Merge "Make test_options.timeout an int64"
2019-05-31 03:11:22 +00:00
TreeHugger Robot
46a221434b
Merge "Fixed the IllegalStateException on removing account"
2019-05-31 03:04:48 +00:00
tmfang
f841748be3
Guard NPE when using search view
...
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226
Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
Ilya Matyukhin
803630c74b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev am: dbe399a023
...
am: c6f766ec2b
Change-Id: Id1f442fbfbe8d2fe63a7fcb5b4e1bce5dfb7e7bc
2019-05-30 18:15:06 -07:00
Ilya Matyukhin
c6f766ec2b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
2019-05-30 18:10:09 -07:00
Bill Yi
f0b3101b24
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617
-s ours am: 71edc54326
-s ours
...
am: d31d5fca30
-s ours
am skip reason: subject contains skip directive
Change-Id: I68b6813309e1742ceb439f0ca223783791f46b0b
2019-05-30 18:00:58 -07:00
Bill Yi
093c8e49a0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617
-s ours am: f78ed7078e
-s ours
...
am: b7cc89cf2d
-s ours
am skip reason: subject contains skip directive
Change-Id: I5e248c36376097e7399d6454c14f9c1e127c2160
2019-05-30 17:56:08 -07:00
TreeHugger Robot
dbe399a023
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
2019-05-31 00:52:11 +00:00
Bill Yi
d31d5fca30
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617
-s ours
...
am: 71edc54326
-s ours
am skip reason: subject contains skip directive
Change-Id: I1c6b00133e923a3244304e129869debba5f3f1b9
2019-05-30 17:49:56 -07:00
Bill Yi
b7cc89cf2d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617
-s ours
...
am: f78ed7078e
-s ours
am skip reason: subject contains skip directive
Change-Id: I02e30980ecd606b9e18dfe1f61af71e0c01706fa
2019-05-30 17:47:52 -07:00
Bill Yi
71edc54326
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1ddb16617
-s ours
am skip reason: subject contains skip directive
Change-Id: I86d2ea6736d4765940832bd48b4d37a9bb5046b7
2019-05-30 17:42:52 -07:00
Bill Yi
f78ed7078e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1ddb16617
-s ours
am skip reason: subject contains skip directive
Change-Id: Id0af6c3c08db79fbfa30f6c50f3e404d5011a9e5
2019-05-30 17:38:37 -07:00
TreeHugger Robot
d1ddb16617
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-31 00:30:42 +00:00
Fan Zhang
5f2d7f841d
Merge "Add slice uri to slice index db"
2019-05-31 00:02:25 +00:00