Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make VPN key icon visible in dark theme."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-29 21:02:19 +00:00
committed by Android (Google) Code Review
parent b331242220 79852c7483
commit c2e5a15239
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
View File

@@ -29,6 +29,7 @@ import android.os.UserManager;
import android.text.Html;
import android.text.Html.ImageGetter;
import android.util.Log;
import android.util.TypedValue;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -111,8 +112,16 @@ public class ConfirmDialog extends AlertActivity
@Override
public Drawable getDrawable(String source) {
// Should only reach this when fetching the VPN icon for the warning string.
Drawable icon = getDrawable(R.drawable.ic_vpn_dialog);
final Drawable icon = getDrawable(R.drawable.ic_vpn_dialog);
icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
final TypedValue tv = new TypedValue();
if (getTheme().resolveAttribute(android.R.attr.textColorPrimary, tv, true)) {
icon.setTint(getColor(tv.resourceId));
} else {
Log.w(TAG, "Unable to resolve theme color");
}
return icon;
}