am 935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev

* commit '935f97cd9bc38fefc5b3358a2151440b85c54c32':
  Show "up navigate" icon in input method subtype enabler
This commit is contained in:
Tadashi G. Takaoka
2014-07-28 02:39:53 +00:00
committed by Android Git Automerger

View File

@@ -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());