Merge pull request #1782 from crankycoder/features/1779-appcompat-ui-fix

Features/1779 appcompat ui fix
mozilla · Apr 26, 2016 · 912129a · 912129a
2 parents bfff196 + 249dc48
commit 912129a
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -236,8 +236,8 @@ dependencies {
     // libraries, because they support a wide range of Android versions and
     // provide APIs for recommended user interface patterns.
 
-    compile "com.android.support:support-v4:21.0.+"
-    compile 'com.android.support:appcompat-v7:19.1.0'
+    compile "com.android.support:support-v4:23.0.0"
+    compile 'com.android.support:appcompat-v7:23.0.0'
 
     compile('org.simpleframework:simple-xml:2.7.1') {
         exclude group: 'stax', module: 'stax-api'

diff --git a/android/src/main/java/org/mozilla/mozstumbler/client/navdrawer/MainDrawerActivity.java b/android/src/main/java/org/mozilla/mozstumbler/client/navdrawer/MainDrawerActivity.java
@@ -11,7 +11,7 @@
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -136,11 +136,15 @@ private void init() {
 
         getSupportActionBar().setTitle(getString(R.string.app_name));
 
+        getSupportActionBar().setHomeButtonEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+        getSupportActionBar().setDisplayUseLogoEnabled(true);
+        getSupportActionBar().setLogo(R.drawable.ic_actionbar);
+
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         mDrawerToggle = new ActionBarDrawerToggle(
                 this,                  /* host Activity */
                 mDrawerLayout,         /* DrawerLayout object */
-                R.drawable.ic_drawer,  /* nav drawer icon to replace 'Up' caret */
                 R.string.drawer_open,  /* "open drawer" description */
                 R.string.drawer_close  /* "close drawer" description */
         ) {

diff --git a/android/src/main/res/drawable-hdpi/ic_actionbar.png b/android/src/main/res/drawable-hdpi/ic_actionbar.png
diff --git a/android/src/main/res/drawable-hdpi/ic_drawer.png b/android/src/main/res/drawable-hdpi/ic_drawer.png
diff --git a/android/src/main/res/drawable-mdpi/ic_drawer.png b/android/src/main/res/drawable-mdpi/ic_drawer.png
diff --git a/android/src/main/res/drawable-xhdpi/ic_drawer.png b/android/src/main/res/drawable-xhdpi/ic_drawer.png
diff --git a/android/src/main/res/layout/button_bg.xml b/android/src/main/res/layout/button_bg.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+</shape>
diff --git a/android/src/main/res/layout/button_bg_pressed.xml b/android/src/main/res/layout/button_bg_pressed.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+</shape>
diff --git a/android/src/main/res/layout/button_selector.xml b/android/src/main/res/layout/button_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item android:state_focused="true" android:state_pressed="true" 
+        android:drawable="@layout/button_bg_pressed" /> 
+<item android:state_focused="false" android:state_pressed="true" 
+        android:drawable="@layout/button_bg_pressed" /> 
+<item android:drawable="@layout/button_bg" /> </selector>
diff --git a/android/src/main/res/layout/fragment_metrics_drawer.xml b/android/src/main/res/layout/fragment_metrics_drawer.xml
@@ -296,15 +296,15 @@
 
             <Button
                 android:id="@+id/button_change_power_setting"
-                style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:background="@layout/button_selector"
                 android:layout_above="@+id/map_info_title"
                 android:layout_alignEnd="@+id/cell_plus_wifi_layout"
                 android:layout_alignRight="@+id/cell_plus_wifi_layout"
-                android:layout_marginBottom="4dp"
                 android:minHeight="0dp"
-                android:text="@string/change_power_saving" />
+                android:text="@string/change_power_saving"
+                android:layout_marginBottom="10dp" />
 
             <TextView
                 android:id="@+id/map_info_title"