From 63639cf47ac7b505bb4a24ae853cfd44d8f86d83 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 8 Nov 2013 09:57:36 -0600 Subject: [PATCH] Replace ActionBarSherlock with AppCompat --- astrid/build.gradle | 5 +++-- astrid/proguard.cfg | 8 +------ .../astrid/actfm/CommentsActivity.java | 4 ++-- .../astrid/actfm/CommentsFragment.java | 12 +++++----- .../astrid/actfm/TagSettingsActivity.java | 18 ++++++++------- .../astrid/activity/AstridActivity.java | 4 ++-- .../astrid/activity/FilterListFragment.java | 8 +++---- .../astrid/activity/TaskEditActivity.java | 12 ++++------ .../astrid/activity/TaskEditFragment.java | 22 ++++++++++--------- .../astrid/activity/TaskListActivity.java | 14 ++++-------- .../astrid/activity/TaskListFragment.java | 11 +++++----- .../astrid/core/CustomFilterActivity.java | 8 +++---- .../astrid/gtasks/GtasksListFragment.java | 2 +- astrid/src/main/res/values/styles.xml | 21 ++++++------------ 14 files changed, 66 insertions(+), 83 deletions(-) diff --git a/astrid/build.gradle b/astrid/build.gradle index f9c3fec8d..dcb6e77e6 100644 --- a/astrid/build.gradle +++ b/astrid/build.gradle @@ -68,8 +68,9 @@ android.applicationVariants.all { variant -> } dependencies { - compile 'com.android.support:support-v4:19.0.+' - compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' + compile group: 'com.android.support', name: 'support-v4', version: '19.0.+' + compile group: 'com.android.support', name: 'appcompat-v7', version: '19.0.+' + compile 'net.simonvt.menudrawer:menudrawer:3.0.4@aar' compile project(":android-aac-enc") diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg index 1e8b342be..ec8622ee3 100644 --- a/astrid/proguard.cfg +++ b/astrid/proguard.cfg @@ -15,6 +15,7 @@ -keep class com.todoroo.astrid.data.* -keep class com.todoroo.astrid.helper.AmazonRequestsHelper -keep class android.support.v4.** +-keep class android.support.v7.** -keep class com.google.gson.stream.JsonReader { public void setLenient(boolean); } @@ -26,19 +27,12 @@ -dontwarn com.google.** -dontnote com.google.common.base.** -#actionbarsherlock preserves --keep class android.support.v4.app.** { *; } --keep interface android.support.v4.app.** { *; } --keep class com.actionbarsherlock.** { *; } --keep interface com.actionbarsherlock.** { *; } -keepattributes *Annotation* -keepclassmembers class **.R$* { public static ; } --dontwarn com.actionbarsherlock.internal.** - # android default preserves -keep public class * extends android.app.Activity -keep public class * extends android.app.Application diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java index cf76af330..fe8c89be9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsActivity.java @@ -8,9 +8,9 @@ package com.todoroo.astrid.actfm; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBar; +import android.view.MenuItem; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.service.ThemeService; diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java index 8b07b9192..3c1c1734b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java @@ -10,12 +10,17 @@ import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; import android.os.Bundle; +import android.support.v4.app.ListFragment; +import android.support.v7.app.ActionBar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.TypedValue; import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; @@ -28,11 +33,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; @@ -47,7 +47,7 @@ import com.todoroo.astrid.data.UserActivity; import org.json.JSONObject; import org.tasks.R; -public abstract class CommentsFragment extends SherlockListFragment { +public abstract class CommentsFragment extends ListFragment { // private TagData tagData; protected UpdateAdapter updateAdapter; diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 217fb9517..1f7c0b787 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -10,19 +10,19 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.text.TextUtils; import android.util.DisplayMetrics; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.Window; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; -import com.actionbarsherlock.view.Window; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.AndroidUtilities; @@ -42,7 +42,9 @@ import org.json.JSONArray; import org.json.JSONObject; import org.tasks.R; -public class TagSettingsActivity extends SherlockFragmentActivity { +import static android.support.v4.view.MenuItemCompat.setShowAsAction; + +public class TagSettingsActivity extends ActionBarActivity { public static final String TOKEN_NEW_FILTER = "newFilter"; //$NON-NLS-1$ @@ -293,13 +295,13 @@ public class TagSettingsActivity extends SherlockFragmentActivity { if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) { item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_cancel)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM); } if (isDialog) { item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_save)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM); } return super.onCreateOptionsMenu(menu); } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java index 2c5276419..b4a55efbf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java @@ -13,12 +13,12 @@ import android.speech.SpeechRecognizer; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBarActivity; import android.view.View; import android.view.WindowManager.BadTokenException; import android.widget.EditText; import android.widget.Toast; -import com.actionbarsherlock.app.SherlockFragmentActivity; import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -57,7 +57,7 @@ import org.tasks.R; * @author Arne * */ -public class AstridActivity extends SherlockFragmentActivity +public class AstridActivity extends ActionBarActivity implements FilterListFragment.OnFilterItemClickedListener, TaskListFragment.OnTaskListItemClickedListener, RecognizerApiListener { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java index 077ae4e6c..e8238afa8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java @@ -16,10 +16,13 @@ import android.content.IntentFilter; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; +import android.support.v4.app.ListFragment; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; @@ -34,9 +37,6 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; import android.widget.Toast; -import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; @@ -51,7 +51,7 @@ import org.tasks.R; * @author Tim Su * */ -public class FilterListFragment extends SherlockListFragment { +public class FilterListFragment extends ListFragment { public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment"; //$NON-NLS-1$ diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 9d8addb4e..2a3abab13 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -7,9 +7,9 @@ package com.todoroo.astrid.activity; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v7.app.ActionBar; import android.view.KeyEvent; -import com.actionbarsherlock.app.ActionBar; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.service.ThemeService; @@ -22,15 +22,11 @@ public class TaskEditActivity extends AstridActivity { @Override protected void onCreate(Bundle savedInstanceState) { ThemeService.applyTheme(this); - ActionBar actionBar = getSupportActionBar(); - if(ThemeService.getTheme() == R.style.Tasks) { - actionBar.setLogo(R.drawable.ic_action_save_light); - } else { - actionBar.setLogo(R.drawable.ic_action_save); - } super.onCreate(savedInstanceState); - setContentView(R.layout.task_edit_wrapper_activity); + + ActionBar actionBar = getSupportActionBar(); + setContentView(R.layout.task_edit_wrapper_activity); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayShowTitleEnabled(true); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index d3118a807..af6dfe316 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -16,11 +16,15 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; import android.speech.RecognizerIntent; +import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.View.MeasureSpec; import android.view.ViewGroup; @@ -37,10 +41,6 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.Toast; -import com.actionbarsherlock.app.SherlockFragment; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -94,6 +94,8 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import static android.support.v4.view.MenuItemCompat.setShowAsAction; + /** * This activity is responsible for creating new tasks and editing existing * ones. It saves a task when it is paused (screen rotated, back button pressed) @@ -102,7 +104,7 @@ import java.util.concurrent.atomic.AtomicReference; * @author timsu * */ -public final class TaskEditFragment extends SherlockFragment implements +public final class TaskEditFragment extends Fragment implements ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { public static final String TAG_TASKEDIT_FRAGMENT = "taskedit_fragment"; //$NON-NLS-1$ @@ -980,15 +982,15 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_new_attachment)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_mic)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_DELETE_TASK_ID, 0, R.string.delete_task); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_discard)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); boolean useSaveAndCancel = Preferences.getBoolean(R.string.p_save_and_cancel, false); @@ -996,13 +998,13 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { if (useSaveAndCancel) { item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_cancel)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); } if (!(getActivity() instanceof TaskEditActivity)) { item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save); item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_save)); - item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + setShowAsAction(item, MenuItem.SHOW_AS_ACTION_ALWAYS); } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 4c43b300c..76cf271df 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -14,16 +14,16 @@ import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager.OnPageChangeListener; +import android.support.v7.app.ActionBar; import android.util.TypedValue; import android.view.KeyEvent; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; @@ -148,15 +148,9 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList } } - @Override - public boolean onMenuItemSelected(int featureId, MenuItem item) { - menuDrawer.closeMenu(); - return super.onMenuItemSelected(featureId, item); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { - getSupportMenuInflater().inflate(R.menu.task_list_activity, menu); + getMenuInflater().inflate(R.menu.task_list_activity, menu); TaskListFragment tlf = getTaskListFragment(); if(tlf instanceof TagViewFragment) { menu.findItem(R.id.menu_delete_list).setVisible(true); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 82ff82d72..098113bed 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -22,12 +22,16 @@ import android.database.sqlite.SQLiteException; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.app.ListFragment; import android.text.TextUtils; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; @@ -40,9 +44,6 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import android.widget.TextView; -import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -105,7 +106,7 @@ import java.util.concurrent.atomic.AtomicReference; * @author Tim Su * */ -public class TaskListFragment extends SherlockListFragment implements OnSortSelectedListener { +public class TaskListFragment extends ListFragment implements OnSortSelectedListener { public static final String TAG_TASKLIST_FRAGMENT = "tasklist_fragment"; //$NON-NLS-1$ @@ -416,7 +417,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele * Create options menu (displayed when user presses menu key) */ @Override - public void onCreateOptionsMenu(Menu menu, com.actionbarsherlock.view.MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { Activity activity = getActivity(); if (activity == null) { return; diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index ca6ff3316..b74fe2700 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -15,20 +15,20 @@ import android.database.Cursor; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.os.Parcelable; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.MenuItem; import android.view.View; import android.view.View.OnCreateContextMenuListener; import android.widget.Button; import android.widget.ListView; import android.widget.TextView; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -66,7 +66,7 @@ import java.util.Map.Entry; * @author Tim Su * */ -public class CustomFilterActivity extends SherlockFragmentActivity { +public class CustomFilterActivity extends ActionBarActivity { private static final String IDENTIFIER_TITLE = "title"; //$NON-NLS-1$ private static final String IDENTIFIER_IMPORTANCE = "importance"; //$NON-NLS-1$ diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index bce6a3d0c..f5d7f9224 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -9,9 +9,9 @@ import android.app.Activity; import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.view.MenuItem; import android.widget.TextView; -import com.actionbarsherlock.view.MenuItem; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml index 3367cec2c..da5e781b5 100644 --- a/astrid/src/main/res/values/styles.xml +++ b/astrid/src/main/res/values/styles.xml @@ -8,7 +8,7 @@ - - - - - - - @@ -131,7 +130,6 @@ true @drawable/panel_background - @null @android:style/Animation.Dialog stateUnspecified|adjustPan fill_parent @@ -142,7 +140,6 @@ @null false - @null #101010 @drawable/task_edit_background @color/blue_theme_color @@ -230,7 +227,6 @@ @drawable/reminder_dialog_inset_background true true - @null @android:style/Animation.Dialog stateUnspecified|adjustPan @@ -312,7 +308,6 @@ @style/TEA_DialogWindowTitle @drawable/dialog_full_holo_dark true - @null @android:style/Animation.Dialog stateUnspecified|adjustResize #ffffff @@ -327,7 +322,6 @@ @null @style/TEA_DialogWindowTitle true - @null @android:style/Animation.Dialog stateUnspecified|adjustResize #ffffff @@ -337,7 +331,6 @@ @null @style/TEA_DialogWindowTitle true - @null @android:style/Animation.Dialog stateUnspecified|adjustResize #000000