Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev

src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java

@@ -15,13 +15,31 @@
  */
 package com.android.settings.inputmethod;
 
+import android.app.ActionBar;
 import android.content.Intent;
+import android.os.Bundle;
 
 import com.android.settings.SettingsActivity;
 
 public class InputMethodAndSubtypeEnablerActivity extends SettingsActivity {
     private static final String FRAGMENT_NAME = InputMethodAndSubtypeEnabler.class.getName();
 
+    @Override
+    protected void onCreate(final Bundle savedState) {
+        super.onCreate(savedState);
+        final ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setHomeButtonEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onNavigateUp() {
+        finish();
+        return true;
+    }
+
     @Override
     public Intent getIntent() {
         final Intent modIntent = new Intent(super.getIntent());