Commit 02324827 authored by Romain Hunault's avatar Romain Hunault

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents a0a95857 eebb7ebf
Pipeline #11936 passed with stage
in 7 minutes and 4 seconds
......@@ -16,6 +16,8 @@
package com.android.settings;
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
......@@ -30,6 +32,8 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
......@@ -59,6 +63,22 @@ public final class SmsDefaultDialog extends AlertActivity implements
}
}
@Override
protected void onStart() {
super.onStart();
getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
android.util.EventLog.writeEvent(0x534e4554, "120484087", -1, "");
}
@Override
protected void onStop() {
super.onStop();
final Window window = getWindow();
final WindowManager.LayoutParams attrs = window.getAttributes();
attrs.privateFlags &= ~PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
window.setAttributes(attrs);
}
@Override
public void onClick(DialogInterface dialog, int which) {
switch (which) {
......@@ -84,7 +104,7 @@ public final class SmsDefaultDialog extends AlertActivity implements
}
private boolean buildDialog(String packageName) {
TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isSmsCapable()) {
// No phone, no SMS
return false;
......@@ -198,7 +218,7 @@ public final class SmsDefaultDialog extends AlertActivity implements
} else {
view.findViewById(R.id.default_label).setVisibility(View.GONE);
}
ImageView imageView = (ImageView)view.findViewById(android.R.id.icon);
ImageView imageView = (ImageView) view.findViewById(android.R.id.icon);
imageView.setImageDrawable(item.icon);
return view;
}
......
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