Commit 9cd3ce44 authored by Sinan Sahin's avatar Sinan Sahin Committed by Commit Bot

Update Web Bluetooth API dialog colors for dark mode

Bug: 951095
Change-Id: I7c0b4fcf529bddff9f8918d57ab707a860e7d505
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562729Reviewed-by: default avatarBecky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Cr-Commit-Position: refs/heads/master@{#650537}
parent 8b06d91a
......@@ -4,7 +4,7 @@
found in the LICENSE file.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:state_selected="true"/>
<item android:color="@color/primary_text_disabled_material_light" android:state_enabled="false"/>
<item android:color="@color/default_icon_color_inverse" android:state_selected="true"/>
<item android:color="@color/default_icon_color_disabled" android:state_enabled="false"/>
<item android:color="@color/default_icon_color"/>
</selector>
......@@ -4,7 +4,7 @@
found in the LICENSE file.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:state_selected="true"/>
<item android:color="@color/primary_text_disabled_material_light" android:state_enabled="false"/>
<item android:color="@color/default_text_color_inverse" android:state_selected="true"/>
<item android:color="@color/disabled_text_color" android:state_enabled="false"/>
<item android:color="@color/default_text_color"/>
</selector>
......@@ -9,7 +9,8 @@
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingBottom="12dp"
android:paddingTop="20dp" >
android:paddingTop="20dp"
android:background="@color/sheet_bg_color">
<!-- The title at the top. -->
<org.chromium.ui.widget.TextViewWithClickableSpans
......
......@@ -185,8 +185,14 @@ public class BluetoothChooserDialog
// Emphasize the origin.
Profile profile = Profile.getLastUsedProfile();
SpannableString origin = new SpannableString(mOrigin);
OmniboxUrlEmphasizer.emphasizeUrl(
origin, mActivity.getResources(), profile, mSecurityLevel, false, true, true);
assert mActivity instanceof ChromeBaseAppCompatActivity;
final boolean useDarkColors = !((ChromeBaseAppCompatActivity) mActivity)
.getNightModeStateProvider()
.isInNightMode();
OmniboxUrlEmphasizer.emphasizeUrl(origin, mActivity.getResources(), profile, mSecurityLevel,
false, useDarkColors, true);
// Construct a full string and replace the origin text with emphasized version.
SpannableString title =
new SpannableString(mActivity.getString(R.string.bluetooth_dialog_title, mOrigin));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment