From 707ca7692a8666989b3fbe860bee28115103988e Mon Sep 17 00:00:00 2001 From: Mohammadinamul Sheik Date: Wed, 22 Jul 2015 16:29:54 -0700 Subject: Handle Cloud Sync and SpellChecker settings when permission changed This build has been compiled against API 23 This build is approved to go out with the M OTA, but may NOT be released to the public until the Play Store has enabled API level 23 apps Version: 4.1.2300x.build_id 1. Disable the settings. 2. Disable the feature. 3. Force reload the facilitator. Bug: 22564048 Change-Id: Ic09742786c3e4efc034bceee836ae6a1e07307a1 (cherry picked from commit 031d04192080f0368f21c3371d1ec6af87375357) --- .../latin/spellcheck/SpellCheckerSettingsActivity.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java') diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java b/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java index 294666b8b..356d9d021 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/SpellCheckerSettingsActivity.java @@ -16,6 +16,7 @@ package com.android.inputmethod.latin.spellcheck; +import com.android.inputmethod.latin.permissions.PermissionsManager; import com.android.inputmethod.latin.utils.FragmentUtils; import android.annotation.TargetApi; @@ -23,11 +24,13 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; +import android.support.v4.app.ActivityCompat; /** * Spell checker preference screen. */ -public final class SpellCheckerSettingsActivity extends PreferenceActivity { +public final class SpellCheckerSettingsActivity extends PreferenceActivity + implements ActivityCompat.OnRequestPermissionsResultCallback { private static final String DEFAULT_FRAGMENT = SpellCheckerSettingsFragment.class.getName(); @Override @@ -48,4 +51,11 @@ public final class SpellCheckerSettingsActivity extends PreferenceActivity { public boolean isValidFragment(String fragmentName) { return FragmentUtils.isValidFragment(fragmentName); } + + @Override + public void onRequestPermissionsResult( + int requestCode, String[] permissions, int[] grantResults) { + PermissionsManager.get(this).onRequestPermissionsResult( + requestCode, permissions, grantResults); + } } -- cgit v1.2.3-83-g751a