Merge "ThemeChooser: Add missing up navigation" into cm-11.0

2 files changed, 17 insertions, 1 deletions

diff --git a/res/values/styles.xml b/res/values/styles.xml
index bcf0dba..7c6563f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:style/Theme.Holo.Light">
+    <style name="AppTheme" parent="android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/ThemeChooserActionBar</item>
         <item name="android:actionBarTabTextStyle">@style/ThemeChooserActionBarTabText</item>
         <item name="android:actionMenuTextColor">#333333</item>
diff --git a/src/org/cyanogenmod/theme/chooser/ChooserActivity.java b/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
index b60011a..76b0bf0 100644
--- a/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
+++ b/src/org/cyanogenmod/theme/chooser/ChooserActivity.java
@@ -18,11 +18,13 @@ package org.cyanogenmod.theme.chooser;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import android.app.ActionBar;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
+import android.view.MenuItem;
 
 public class ChooserActivity extends FragmentActivity {
     public static final String TAG = ChooserActivity.class.getName();
@@ -35,6 +37,11 @@ public class ChooserActivity extends FragmentActivity {
         setContentView(R.layout.activity_main);
         NotificationHijackingService.ensureEnabled(this);
 
+        ActionBar mActionBar = getActionBar();
+        if (mActionBar != null) {
+            mActionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
         if (savedInstanceState == null) {
             //Determine if there we need to filter by component (ex icon sets only)
             final Intent intent = getIntent();
@@ -75,4 +82,13 @@ public class ChooserActivity extends FragmentActivity {
             getSupportFragmentManager().beginTransaction().replace(R.id.content, fragment, "ChooserBrowseFragment").commit();
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return false;
+    }
 }