TreeHugger Robot
c8b2d09997
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12
...
Change-Id: I8633badcf8c7ca68b9d7a48eb2272ab3162f0d57
2020-04-29 19:09:30 +00:00
TreeHugger Robot
9b697898d6
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3
...
Change-Id: I927d2a024ef5c09a5acc4064d7577c759d464ad0
2020-04-29 19:09:29 +00:00
TreeHugger Robot
9e400e14c3
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662
...
Change-Id: If3c8e5947552fc3ec1455ef8215acf58a9ee31aa
2020-04-29 18:55:09 +00:00
TreeHugger Robot
7bb2488099
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662
...
Change-Id: Ic026c305eabbd86dc780292d666d0aa47e0c8ca9
2020-04-29 18:55:06 +00:00
TreeHugger Robot
e22a776b12
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9
...
Change-Id: I72bfce2fd18f59c010ccb89203a7a7b3feb73ca6
2020-04-29 18:54:56 +00:00
TreeHugger Robot
4d6ad1dec9
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
...
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
2020-04-29 18:40:34 +00:00
TreeHugger Robot
f57fcea662
Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
...
Change-Id: Id187f39dc00fc84479f43545b71f70a64fab03d2
2020-04-29 18:40:08 +00:00
TreeHugger Robot
7e94c5e3b3
Merge "Fix icon color in dark theme." into rvc-dev
2020-04-29 18:02:45 +00:00
Julia Reynolds
98509cbfb9
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 am: c40e8da0e8 am: 8f438d94c0 am: 1510e163c2
...
Change-Id: I4dc47c4bf03411bb6e079d04b615dbce31cc15c4
2020-04-29 16:45:12 +00:00
Julia Reynolds
321518089e
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d am: de38eab8ff am: f225e2e9b3 am: 5e9a6f36d4
...
Change-Id: I88f2c034dd0aa822cce0c859058d4e70ba2b8196
2020-04-29 16:44:57 +00:00
kholoud mohamed
7c84508e16
Fix icon color in dark theme.
...
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
2020-04-29 17:43:34 +01:00
Julia Reynolds
38b84f7ebc
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe am: c50085fed5 am: 573cd1d0aa am: b43188f5df
...
Change-Id: I0ec8c2872f54ec22f281a7e1bf947e337e42d99d
2020-04-29 16:43:29 +00:00
Automerger Merge Worker
4f65828567
Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351 am: 44c2169ca8 am: 50210a23d2
...
Change-Id: Ie5956e0818bec58a02f7050b8c7f9761be0a491c
2020-04-29 16:43:13 +00:00
Julia Reynolds
f76cee6244
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03 am: adfd6ba13e
...
Change-Id: I60cdb48528604d693889411c9e1efa027bd3a47d
2020-04-29 16:41:13 +00:00
Julia Reynolds
92ae83640b
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625 am: e546135a18 am: 0f331cc786
...
Change-Id: I2ba72faac9124dba5164373b09685c64371fdde9
2020-04-29 16:40:54 +00:00
Julia Reynolds
1510e163c2
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 am: c40e8da0e8 am: 8f438d94c0
...
Change-Id: Ic90c4752299e4ab89decef656b1fbfe6711b7d4f
2020-04-29 16:26:48 +00:00
Julia Reynolds
5e9a6f36d4
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d am: de38eab8ff am: f225e2e9b3
...
Change-Id: I495a57fe9164f3c6b0f1501341befec3f2946313
2020-04-29 16:26:24 +00:00
Julia Reynolds
b43188f5df
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe am: c50085fed5 am: 573cd1d0aa
...
Change-Id: Icb28283ac1cfbc4578e66760498d2bcffd7318e7
2020-04-29 16:26:14 +00:00
Automerger Merge Worker
50210a23d2
Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351 am: 44c2169ca8
...
Change-Id: I74361489e59dc210a7343050847c7bc7d56b5ddf
2020-04-29 16:26:03 +00:00
Julia Reynolds
adfd6ba13e
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03
...
Change-Id: I28f44b8929ad28e241ca9781a4cb9a80549b21e4
2020-04-29 16:25:50 +00:00
Julia Reynolds
0f331cc786
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625 am: e546135a18
...
Change-Id: I62ebb3f11b46aeadfbaeec9a17921852abf8538e
2020-04-29 16:24:30 +00:00
Julia Reynolds
8f438d94c0
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 am: c40e8da0e8
...
Change-Id: I8ade2d99ae85db6c5f6e4a2136b0115451f68c07
2020-04-29 16:23:06 +00:00
Julia Reynolds
f225e2e9b3
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d am: de38eab8ff
...
Change-Id: I4f462887554f8f7da28439bdc46a3bb55fac9840
2020-04-29 16:22:52 +00:00
Julia Reynolds
573cd1d0aa
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe am: c50085fed5
...
Change-Id: Ia6037a761f3583bad69468c9ab6d1007c698e97c
2020-04-29 16:06:29 +00:00
Automerger Merge Worker
44c2169ca8
Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351
...
Change-Id: I11efdc0234e75d99e125a9f6bd82c973f455be5c
2020-04-29 16:06:21 +00:00
Julia Reynolds
c106e6bc03
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36
...
Change-Id: Id0e3fb0481c695fc2814df9ef66cb23c2cf8980e
2020-04-29 16:06:03 +00:00
Julia Reynolds
c40e8da0e8
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6
...
Change-Id: Idd375fa19764da78b9578fde838dec0d5e28def2
2020-04-29 16:05:01 +00:00
Julia Reynolds
de38eab8ff
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d
...
Change-Id: If6b8048c2bd31b5554d2a9edb534da0ed67e4f2d
2020-04-29 16:04:33 +00:00
Julia Reynolds
e546135a18
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625
...
Change-Id: Id579763544b0fb0f4e5dff56806596d70faeedf4
2020-04-29 16:04:32 +00:00
Julia Reynolds
34190304f6
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0
...
Change-Id: Ic622a6c1a55497b36d801421d1e03d5283e989ce
2020-04-29 15:53:23 +00:00
Julia Reynolds
c50085fed5
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe
...
Change-Id: I5a1dd1e140503957a3335b92f0687a928aa40b30
2020-04-29 15:53:15 +00:00
Julia Reynolds
90d574727d
Fix bubble tests am: 99b363fb18 am: d4045296ba
...
Change-Id: Iee0a86cae2ac5dfa8f7e775280d0a5408224c7ee
2020-04-29 15:53:09 +00:00
Automerger Merge Worker
e994133351
Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp
2020-04-29 15:53:06 +00:00
Julia Reynolds
d695f0e907
Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f
...
Change-Id: I6b29bb7f13044a899ef05094851bf9246bf3a283
2020-04-29 15:53:02 +00:00
Julia Reynolds
68d3972a36
Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0
...
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
90d41ad625
Fix bubble tests am: 99b363fb18 am: d4045296ba
...
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
2020-04-29 15:52:44 +00:00
Julia Reynolds
04b6152ef0
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +00:00
Julia Reynolds
d4045296ba
Fix bubble tests am: 99b363fb18
...
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
2020-04-29 15:42:00 +00:00
Julia Reynolds
8c5d6b6d5f
Fix bubble tests am: 99b363fb18
...
Change-Id: Ie06e993258c7c3069e28fb280ed24bed32675133
2020-04-29 15:41:47 +00:00
Julia Reynolds
e2eb832033
Merge "Remove unused development setting" into rvc-dev
2020-04-29 15:25:24 +00:00
TreeHugger Robot
dfa938577d
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0 am: 0ad7e5dbcf am: f2f04cb533
...
Change-Id: I29cfacf60306571b5f3dc1e2c0b3d819848fda4c
2020-04-29 14:30:53 +00:00
TreeHugger Robot
89c40714b4
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e am: 9d5fa99a60 am: 0127654666
...
Change-Id: I1579b1ec5a9ac777676ba2ff4a0cce8f33d79eda
2020-04-29 14:30:46 +00:00
TreeHugger Robot
64018512ed
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da am: 6faaa7caaf
...
Change-Id: I3adf38c9704dae37fa8e78ac75e0ffd466d04462
2020-04-29 14:30:39 +00:00
TreeHugger Robot
f2f04cb533
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0 am: 0ad7e5dbcf
...
Change-Id: Ic5c2508b709c0c52b5cf15f080e99112200cff2b
2020-04-29 14:18:26 +00:00
TreeHugger Robot
0127654666
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e am: 9d5fa99a60
...
Change-Id: I862aa7dd5dac9314779ffac7990cf15e4e90bdee
2020-04-29 14:18:19 +00:00
TreeHugger Robot
0ad7e5dbcf
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: ea0934d5e5 am: db329e92d0
...
Change-Id: I00931d862378f8460c4a8d2b11a2d1a87c5c019a
2020-04-29 14:18:14 +00:00
TreeHugger Robot
6faaa7caaf
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da
...
Change-Id: I57f9070cadb4d8bed271825a66fa1076e836b0d0
2020-04-29 14:18:07 +00:00
Alex Johnston
439947aec7
Update work challenge header in Settings
...
* If organization name has been set for
a managed profile, work challenge
should display it as the header.
Bug: 155274026
Test: manual testing
Manual Testing Steps
* Set up device with managed profile
* Set organization name via TestDPC
* Go Settings > Security > Work profile security
and add a work profile lock
* Select 'Work profile lock' and verify
organization name is shown in header
Change-Id: I83209383fd2cf9179c34ccfdf8c097c379ec933e
2020-04-29 15:14:20 +01:00
Julia Reynolds
99b363fb18
Fix bubble tests
...
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
