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

Merge "Add dark theme for Shell app." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-29 14:03:55 +00:00
committed by Android (Google) Code Review
parent 75d5091eb3 8549ccf69b
commit 190e99cf3a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Shell/AndroidManifest.xml
View File

@@ -206,8 +206,9 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/> <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:defaultToDeviceProtectedStorage="true" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:directBootAware="true"> android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true">
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.android.shell" android:authorities="com.android.shell"
@@ -232,7 +233,6 @@
<activity <activity
android:name=".BugreportWarningActivity" android:name=".BugreportWarningActivity"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" /> android:exported="false" />

7
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -99,6 +99,7 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Patterns; import android.util.Patterns;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.ContextThemeWrapper;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
@@ -1467,11 +1468,13 @@ public class BugreportProgressService extends Service {
void initialize(final Context context, BugreportInfo info) { void initialize(final Context context, BugreportInfo info) {
final String dialogTitle = final String dialogTitle =
context.getString(R.string.bugreport_info_dialog_title, info.id); context.getString(R.string.bugreport_info_dialog_title, info.id);
final Context themedContext = new ContextThemeWrapper(
context, com.android.internal.R.style.Theme_DeviceDefault_DayNight);
// First initializes singleton. // First initializes singleton.
if (mDialog == null) { if (mDialog == null) {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
// It's ok pass null ViewRoot on AlertDialogs. // It's ok pass null ViewRoot on AlertDialogs.
final View view = View.inflate(context, R.layout.dialog_bugreport_info, null); final View view = View.inflate(themedContext, R.layout.dialog_bugreport_info, null);
mInfoName = (EditText) view.findViewById(R.id.name); mInfoName = (EditText) view.findViewById(R.id.name);
mInfoTitle = (EditText) view.findViewById(R.id.title); mInfoTitle = (EditText) view.findViewById(R.id.title);
@@ -1488,7 +1491,7 @@ public class BugreportProgressService extends Service {
} }
}); });
mDialog = new AlertDialog.Builder(context) mDialog = new AlertDialog.Builder(themedContext)
.setView(view) .setView(view)
.setTitle(dialogTitle) .setTitle(dialogTitle)
.setCancelable(true) .setCancelable(true)