diff options
author | 2015-07-16 00:30:54 +0000 | |
---|---|---|
committer | 2015-07-16 00:30:54 +0000 | |
commit | 641e2bd3152be76b604ae24dcb6b736fd8853d16 (patch) | |
tree | 8cabb3a61d743506973fa946b69a4e3f604f675a /java/src/com/android/inputmethod/latin/settings/SettingsActivity.java | |
parent | 93193ccf436cb6592de1e9bca5476d6a5278ca48 (diff) | |
parent | 1c47b2d83dc23fb56f4d7dbd7711d828850d8882 (diff) | |
download | latinime-641e2bd3152be76b604ae24dcb6b736fd8853d16.tar.gz latinime-641e2bd3152be76b604ae24dcb6b736fd8853d16.tar.xz latinime-641e2bd3152be76b604ae24dcb6b736fd8853d16.zip |
am 1c47b2d8: am 992144a8: am 60415866: [LatinIME] Support MNC permissions.
* commit '1c47b2d83dc23fb56f4d7dbd7711d828850d8882':
[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.java | 10 |
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); + } } |