summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2015-10-15 14:09:06 +0200
committerSteve Kondik <steve@cyngn.com>2015-10-18 14:13:47 -0700
commit1c929421cda031b92ed7f95b0ab59a469fc07cee (patch)
treede0f89c9b741f113952b10609fd52111b21d0013 /src
parent65fc7b9b4a36aa31e7fe1b4fe35206f440d1c548 (diff)
downloadandroid_packages_apps_UnifiedEmail-1c929421cda031b92ed7f95b0ab59a469fc07cee.tar.gz
android_packages_apps_UnifiedEmail-1c929421cda031b92ed7f95b0ab59a469fc07cee.tar.bz2
android_packages_apps_UnifiedEmail-1c929421cda031b92ed7f95b0ab59a469fc07cee.zip
Add an ActionBar to the mail app's PreferenceActivity.
Change-Id: Ie068bcb3e0f7f92fc4dc799f5d8913731d5296ba
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/ui/settings/BasePreferenceActivity.java49
-rw-r--r--src/com/android/mail/ui/settings/MailPreferenceActivity.java19
2 files changed, 58 insertions, 10 deletions
diff --git a/src/com/android/mail/ui/settings/BasePreferenceActivity.java b/src/com/android/mail/ui/settings/BasePreferenceActivity.java
new file mode 100644
index 000000000..c55bb4c6d
--- /dev/null
+++ b/src/com/android/mail/ui/settings/BasePreferenceActivity.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mail.ui.settings;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toolbar;
+
+import com.android.mail.R;
+
+public abstract class BasePreferenceActivity extends PreferenceActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setActionBar(toolbar);
+ }
+
+ @Override
+ public void setContentView(int layoutResID) {
+ final LayoutInflater inflater = getLayoutInflater();
+ View contentView = inflater.inflate(R.layout.preference_activity, null);
+
+ ViewGroup contentWrapper = (ViewGroup) contentView.findViewById(android.R.id.content);
+ inflater.inflate(layoutResID, contentWrapper);
+
+ getWindow().setContentView(contentView);
+ }
+
+}
diff --git a/src/com/android/mail/ui/settings/MailPreferenceActivity.java b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
index 57bb75575..348dffb46 100644
--- a/src/com/android/mail/ui/settings/MailPreferenceActivity.java
+++ b/src/com/android/mail/ui/settings/MailPreferenceActivity.java
@@ -17,14 +17,12 @@
package com.android.mail.ui.settings;
-import android.app.ActionBar;
import android.app.Fragment;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.CursorLoader;
import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
-import android.preference.PreferenceActivity;
import android.text.TextUtils;
import com.android.mail.R;
@@ -37,7 +35,7 @@ import com.google.common.annotations.VisibleForTesting;
import java.lang.ref.WeakReference;
import java.util.List;
-public class MailPreferenceActivity extends PreferenceActivity {
+public class MailPreferenceActivity extends BasePreferenceActivity {
public static final String PREFERENCE_FRAGMENT_ID = "preference_fragment_id";
@@ -51,13 +49,6 @@ public class MailPreferenceActivity extends PreferenceActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- final ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- // Hide the app icon.
- actionBar.setIcon(android.R.color.transparent);
- actionBar.setDisplayUseLogoEnabled(false);
- }
-
getLoaderManager().initLoader(ACCOUNT_LOADER_ID, null, new AccountLoaderCallbacks());
}
@@ -138,4 +129,12 @@ public class MailPreferenceActivity extends PreferenceActivity {
*/
public void onBuildExtraHeaders(List<Header> target) {
}
+
+ @Override
+ public void switchToHeader(String fragmentName, Bundle args) {
+ super.switchToHeader(fragmentName, args);
+ if (args != null && args.containsKey(MailAccountPrefsFragment.ARG_ACCOUNT_EMAIL)) {
+ showBreadCrumbs(args.getString(MailAccountPrefsFragment.ARG_ACCOUNT_EMAIL), null);
+ }
+ }
}