aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
diff options
context:
space:
mode:
authorMohammadinamul Sheik <inamul@google.com>2015-07-16 00:04:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-16 00:04:12 +0000
commit992144a8c2808c390678d57cc1163d24c63cdcb4 (patch)
tree8cabb3a61d743506973fa946b69a4e3f604f675a /java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
parentef1cb855a84173417089715a595ecba6c6cde4ca (diff)
parent604158669b407a40cd0f23538fad4dce5d738f24 (diff)
downloadlatinime-992144a8c2808c390678d57cc1163d24c63cdcb4.tar.gz
latinime-992144a8c2808c390678d57cc1163d24c63cdcb4.tar.xz
latinime-992144a8c2808c390678d57cc1163d24c63cdcb4.zip
am 60415866: [LatinIME] Support MNC permissions.
* commit '604158669b407a40cd0f23538fad4dce5d738f24': [LatinIME] Support MNC permissions.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsActivity.java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
index 9975277e4..a7d157a6b 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsActivity.java
@@ -16,6 +16,7 @@
package com.android.inputmethod.latin.settings;
+import com.android.inputmethod.latin.permissions.PermissionsManager;
import com.android.inputmethod.latin.utils.FragmentUtils;
import com.android.inputmethod.latin.utils.StatsUtils;
import com.android.inputmethod.latin.utils.StatsUtilsManager;
@@ -24,9 +25,11 @@ import android.app.ActionBar;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceActivity;
+import android.support.v4.app.ActivityCompat;
import android.view.MenuItem;
-public final class SettingsActivity extends PreferenceActivity {
+public final class SettingsActivity extends PreferenceActivity
+ implements ActivityCompat.OnRequestPermissionsResultCallback {
private static final String DEFAULT_FRAGMENT = SettingsFragment.class.getName();
public static final String EXTRA_SHOW_HOME_AS_UP = "show_home_as_up";
@@ -77,4 +80,9 @@ public final class SettingsActivity extends PreferenceActivity {
public boolean isValidFragment(final String fragmentName) {
return FragmentUtils.isValidFragment(fragmentName);
}
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+ PermissionsManager.get(this).onRequestPermissionsResult(requestCode, permissions, grantResults);
+ }
}