diff options
| author | Christine Franks <christyfranks@google.com> | 2016-12-14 20:39:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-14 20:39:07 +0000 |
| commit | 0348605c41d6ce2b9270a09851c3e9ba29c7bd87 (patch) | |
| tree | d6b096f9ee127806fe09c3ec5143d2c2d27a4c61 /src/com/android/deskclock | |
| parent | e63f127d8dba518b0859db880fca5ba647abbbfc (diff) | |
| parent | a5fa7fac7743829560b4dfbe48b673e6d7300499 (diff) | |
| download | android_packages_apps_DeskClock-0348605c41d6ce2b9270a09851c3e9ba29c7bd87.tar.gz android_packages_apps_DeskClock-0348605c41d6ce2b9270a09851c3e9ba29c7bd87.tar.bz2 android_packages_apps_DeskClock-0348605c41d6ce2b9270a09851c3e9ba29c7bd87.zip | |
Merge "Prevent navigation bar from displaying on screensaver exit" into ub-deskclock-huddle
Diffstat (limited to 'src/com/android/deskclock')
| -rw-r--r-- | src/com/android/deskclock/ScreensaverActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java index ada33d8e8..3b0988b4c 100644 --- a/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java @@ -26,7 +26,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.provider.Settings; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.ViewTreeObserver.OnPreDrawListener; import android.view.Window; @@ -39,7 +38,7 @@ import com.android.deskclock.uidata.UiDataModel; import static android.content.Intent.ACTION_BATTERY_CHANGED; import static android.os.BatteryManager.EXTRA_PLUGGED; -public class ScreensaverActivity extends AppCompatActivity { +public class ScreensaverActivity extends BaseActivity { private static final LogUtils.Logger LOGGER = new LogUtils.Logger("ScreensaverActivity"); |