Nate Myren
93e1d353a9
Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f
am: fbe64a68da
am: 6544d27f38
...
Change-Id: I9126e32a7d39a859c1b500e552e8279dbb661b62
2020-05-11 23:33:57 +00:00
Nate Myren
6544d27f38
Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f
am: fbe64a68da
...
Change-Id: I4d808c3ca220f0cdc764e1f26a6b84df94e7c07f
2020-05-11 23:15:57 +00:00
Nate Myren
fbe64a68da
Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f
...
Change-Id: I547a008b73764af371f27710c1f94348fb3d0644
2020-05-11 22:55:34 +00:00
Nate Myren
0c6037af5f
Merge "Add Auto Revoke log to the App Info page" into rvc-dev
2020-05-11 22:37:04 +00:00
TreeHugger Robot
576f6c9c75
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours am: 2aba367d93
-s ours am: 9fef083817
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8796e4da0d92ec439087a1f37f52455efc00a4e1
2020-05-11 20:14:51 +00:00
TreeHugger Robot
e729b2143f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours am: 0356deba45
-s ours am: ced58c796a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0068c1caea4fb67f01424e00e158cc29d1fd18a0
2020-05-11 20:14:37 +00:00
TreeHugger Robot
d3ea4c9bdc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 57150e5930
-s ours am: 7d8a49df56
-s ours am: 619fa7a394
-s ours am: def9a297cc
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic6b758692188fc9ce96dc8cbfa2065d979cc0549
2020-05-11 20:14:15 +00:00
TreeHugger Robot
f54237fa10
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca5d1ee340
-s ours am: cff01cd493
-s ours am: b866d5b243
-s ours am: b8cdb350e3
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idef9f808ed58a79596b098ca861e225fa979251d
2020-05-11 20:13:37 +00:00
TreeHugger Robot
944a2665a5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours am: 4470cc0dbe
-s ours am: 42afd7375d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I368c6c36bee8f819b41a6eb03f0c53c8e57dfd8e
2020-05-11 20:12:36 +00:00
TreeHugger Robot
0fd2fab42b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours am: 437ea82856
-s ours am: c610c1d4ef
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5e376568cf65cb1b0b44033ab884ad1e35539bd7
2020-05-11 20:08:44 +00:00
TreeHugger Robot
9fef083817
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours am: 2aba367d93
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I93c536b6f3a95399c8f2d3031f2e5209000121f7
2020-05-11 20:00:42 +00:00
TreeHugger Robot
ced58c796a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours am: 0356deba45
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifa4ede0a656caed4e5d51b633791e8404cb1edea
2020-05-11 19:59:00 +00:00
TreeHugger Robot
def9a297cc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 57150e5930
-s ours am: 7d8a49df56
-s ours am: 619fa7a394
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I48cec1a4f7f267dc93dd8a181d34e24655d8cc40
2020-05-11 19:55:46 +00:00
TreeHugger Robot
b8cdb350e3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca5d1ee340
-s ours am: cff01cd493
-s ours am: b866d5b243
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I36777cc9e4b202cc92cb7152fecfcecfd81657de
2020-05-11 19:55:38 +00:00
TreeHugger Robot
42afd7375d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours am: 4470cc0dbe
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5d80c2a347836cfef203e9438b6353ddf0234101
2020-05-11 19:55:14 +00:00
TreeHugger Robot
c610c1d4ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours am: 437ea82856
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I92b2d0dcd6a9b9ebeedacc53b4be76e677d0071e
2020-05-11 19:51:47 +00:00
TreeHugger Robot
619fa7a394
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 57150e5930
-s ours am: 7d8a49df56
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iafc93775646e95595029a9b8b0bbbf382261b2d6
2020-05-11 19:48:34 +00:00
TreeHugger Robot
b866d5b243
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca5d1ee340
-s ours am: cff01cd493
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I47c795cb8fa663c5f58186f7fe3328ef23e9833b
2020-05-11 19:46:36 +00:00
TreeHugger Robot
2aba367d93
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I968f9dc638cfbd4bf20359cb61390b47bba4fe9e
2020-05-11 19:41:18 +00:00
TreeHugger Robot
0356deba45
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I38ab426f1a2c133524a3272d622e7ddae384377e
2020-05-11 19:41:11 +00:00
TreeHugger Robot
4470cc0dbe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 7605eef0ed
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I1efdf31a04e279597fa68ebe32b35fa4127f244a
2020-05-11 19:41:00 +00:00
TreeHugger Robot
437ea82856
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: d9ebaabd68
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic2577d27105ea0880a27ffdbf570b7e5a484e956
2020-05-11 19:38:38 +00:00
TreeHugger Robot
7d8a49df56
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 57150e5930
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5c5a1e4b306494c4f4560cea697d1bc44ba33cde
2020-05-11 19:33:42 +00:00
TreeHugger Robot
cff01cd493
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ca5d1ee340
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0e868e6f377d3f31a781e16aeda8caaec2aa016a
2020-05-11 19:32:00 +00:00
TreeHugger Robot
bb76e6e8e2
Merge "Import translations. DO NOT MERGE"
2020-05-11 18:41:27 +00:00
TreeHugger Robot
7605eef0ed
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-11 18:27:24 +00:00
TreeHugger Robot
6b9ddf165c
Merge "Import translations. DO NOT MERGE"
2020-05-11 18:18:44 +00:00
TreeHugger Robot
d9ebaabd68
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-11 18:04:41 +00:00
Kholoud Mohamed
bcbd9158d6
String changes in the cross profile settings page
...
Fixes: 155771527
Test: visually tested the string changes.
Change-Id: Idcde93e2035bb8d3d82213befb652aa29aa12efe
2020-05-11 18:38:05 +01:00
TreeHugger Robot
57150e5930
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-11 17:31:56 +00:00
TreeHugger Robot
ca5d1ee340
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-11 17:30:09 +00:00
Jay Aliomer
9073b2f968
Unable to select twilight scheduling after enabling location
...
Test: run settings tests
Change-Id: I74945dd69f0da9733ee0a5e27ab63852df9544e9
Bug: 153115261
2020-05-11 16:31:42 +00:00
TreeHugger Robot
09102972c4
Merge "[Wi-Fi] Apply WifiTrackerLib objects in WifiDppQrCodeScannerFragment"
2020-05-11 15:39:50 +00:00
Arc Wang
a76a4232e8
[Wi-Fi] Fix QR code generator summary string
...
Apply new string design for UX improvement.
Bug: 153566353
Test: manual visual
Change-Id: I722c1db9871cd8d1172e10880d7ef7f87e80a0a1
2020-05-11 22:21:05 +08:00
Arc Wang
b04ea2dde5
[Wi-Fi] Apply WifiTrackerLib objects in WifiDppQrCodeScannerFragment
...
Bug: 152571756
Bug: 145100890
Test: manual
Scan QR code and check connection.
Change-Id: I21b9fadc83ab185df5710f4bf777afec3dfbbc8d
2020-05-11 22:17:55 +08:00
Automerger Merge Worker
97fe213b11
Merge "Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: ce855ed43e" into rvc-qpr-dev-plus-aosp am: 8cc58ffe1d
...
Change-Id: Idf42e02b89c2226e099aff0c0df261bb76c854a8
2020-05-11 13:25:56 +00:00
TreeHugger Robot
116fae2739
Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: dcf5391ec4
am: 6733b9d532
...
Change-Id: I2240193a7e8ffc93cdb633c8f746740109f8a7ef
2020-05-11 13:25:13 +00:00
Automerger Merge Worker
6230810f51
Merge "Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
am: 325e4bc058
am: 7329e047c2" into rvc-qpr-dev-plus-aosp am: cdea0a3bd9
...
Change-Id: Ice73b54dc0279c3f4f4b8dcc79c22a964f5f829a
2020-05-11 13:24:28 +00:00
tim peng
9620fb43d6
Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
am: 325e4bc058
am: 1cb4dd68cb
am: 0e9b30a837
...
Change-Id: I65c8694270a7ac64f83e6ef39885c0627391d5c4
2020-05-11 13:23:28 +00:00
TreeHugger Robot
047c8b9c59
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
-s ours am: 6e72ed8749
-s ours am: 6495886a7e
-s ours am: 458abbad70
-s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63
is in history
Change-Id: I27a12759ab025621776e316e2c335a5db069f0c2
2020-05-11 13:22:15 +00:00
TreeHugger Robot
90da36c153
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
-s ours am: 6e72ed8749
-s ours am: d67e7d101c
-s ours am: 07f59a8f2a
-s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63
is in history
Change-Id: Ia4875e8999c61b9713e7033a0b6568d5cac5d75e
2020-05-11 13:21:26 +00:00
Automerger Merge Worker
8cc58ffe1d
Merge "Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: ce855ed43e" into rvc-qpr-dev-plus-aosp
2020-05-11 13:10:45 +00:00
TreeHugger Robot
b044c193da
Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: ce855ed43e
...
Change-Id: I4eea44c40359e65c8b5cc7612ad3b5427963cd8f
2020-05-11 13:10:41 +00:00
TreeHugger Robot
6733b9d532
Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
am: dcf5391ec4
...
Change-Id: I69724fb3d8136fec02944b50f4e543a684380a17
2020-05-11 13:10:40 +00:00
Automerger Merge Worker
cdea0a3bd9
Merge "Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
am: 325e4bc058
am: 7329e047c2" into rvc-qpr-dev-plus-aosp
2020-05-11 13:10:09 +00:00
tim peng
092b55d9b1
Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
am: 325e4bc058
am: 7329e047c2
...
Change-Id: I9cbd418b3b65f48ed72f8eb8f2e4f6fa5f088426
2020-05-11 13:10:04 +00:00
tim peng
0e9b30a837
Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
am: 325e4bc058
am: 1cb4dd68cb
...
Change-Id: Iaaa8165b0f6f99548b23cd043832033551573500
2020-05-11 13:10:00 +00:00
TreeHugger Robot
458abbad70
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
-s ours am: 6e72ed8749
-s ours am: 6495886a7e
-s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63
is in history
Change-Id: Id357e17af22d7d9c1ab4c246e353aac8cabe1486
2020-05-11 13:09:32 +00:00
TreeHugger Robot
07f59a8f2a
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
-s ours am: 6e72ed8749
-s ours am: d67e7d101c
-s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 2d9fb25e63
is in history
Change-Id: Ib2cc006834757e11f05cd848e694b7d1377dc942
2020-05-11 13:09:09 +00:00
TreeHugger Robot
ce855ed43e
Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
am: e7e0479c36
...
Change-Id: Ie24bfdb97a15f77ea3c61682ca605222e07d2ff9
2020-05-11 12:56:42 +00:00