am daea8036: am 47c8359a: am 3fea2f1a: am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13
* commit 'daea8036276dafcdb24bbece9e9d374886e5601e':
Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
index b8bd4dc..c215db1 100644
--- a/res/xml/widget_info.xml
+++ b/res/xml/widget_info.xml
@@ -21,5 +21,4 @@
android:previewImage="@drawable/email_widget_preview"
android:initialLayout="@layout/widget"
android:resizeMode="horizontal|vertical"
- android:configure="com.android.email.widget.WidgetConfiguration"
- android:widgetCategory="home_screen|keyguard" />
+ android:configure="com.android.email.widget.WidgetConfiguration" />
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index dae3597..a8ff8f9 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -27,7 +27,6 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.WindowManager;
import android.widget.TextView;
import com.android.email.Controller;
@@ -189,7 +188,6 @@
super.onCreate(savedInstanceState);
ActivityHelper.debugSetWindowFlags(this);
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
setContentView(mUIController.getLayoutId());
mUIController.onActivityViewReady();
