aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-21 07:36:08 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-21 07:36:08 +0000
commit436126a86b82b45c07fddb1bb345ab0414059a56 (patch)
tree83de2fbf965a4cd4546da50033ce01ae78801fcd
parent0b8d0f332863269cbbbb11a8e79034a5c1fa2703 (diff)
parent11224977e72b1576cf6fff0c2154361a9d2ded2e (diff)
downloadMessaging-436126a86b82b45c07fddb1bb345ab0414059a56.tar.gz
release-request-91ef8626-1af7-4595-b2bd-2d85ee97e99f-for-git_oc-mr1-release-4029936 snap-temp-L27200000066301195
Change-Id: I0bc1003d16a2ebce547f0444ed40196460c0c6fa
-rw-r--r--src/com/android/messaging/ui/BugleActionBarActivity.java4
-rw-r--r--src/com/android/messaging/util/UiUtils.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/messaging/ui/BugleActionBarActivity.java b/src/com/android/messaging/ui/BugleActionBarActivity.java
index 80dabb8..5d9c63a 100644
--- a/src/com/android/messaging/ui/BugleActionBarActivity.java
+++ b/src/com/android/messaging/ui/BugleActionBarActivity.java
@@ -19,7 +19,7 @@ package com.android.messaging.ui;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuInflater;
@@ -40,7 +40,7 @@ import java.util.Set;
* needs that will be common for all activities. We can break out the common code if/when we need
* a version that doesn't use an actionbar.
*/
-public class BugleActionBarActivity extends ActionBarActivity implements ImeUtil.ImeStateHost {
+public class BugleActionBarActivity extends AppCompatActivity implements ImeUtil.ImeStateHost {
// Tracks the list of observers opting in for IME state change.
private final Set<ImeUtil.ImeStateObserver> mImeStateObservers = new HashSet<>();
diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java
index 84fe353..e446c73 100644
--- a/src/com/android/messaging/util/UiUtils.java
+++ b/src/com/android/messaging/util/UiUtils.java
@@ -27,7 +27,7 @@ import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.text.Html;
import android.text.Spanned;
import android.text.TextPaint;
@@ -370,7 +370,7 @@ public class UiUtils {
return result.toString();
}
- public static void setActionBarShadowVisibility(final ActionBarActivity activity, final boolean visible) {
+ public static void setActionBarShadowVisibility(final AppCompatActivity activity, final boolean visible) {
final ActionBar actionBar = activity.getSupportActionBar();
actionBar.setElevation(visible ?
activity.getResources().getDimensionPixelSize(R.dimen.action_bar_elevation) :