From 54c2af9213e4eed4d0b54a9fc356a24c73290f23 Mon Sep 17 00:00:00 2001 From: Tarandeep Singh Date: Mon, 8 Jul 2019 14:04:47 -0700 Subject: [PATCH] Remove usage of PER_PROFILE_IME_ENABLED property in settings PER_PROFILE_IME_ENABLED is default enabled in Q. We no longer need to have this property. Bug: 135775619 Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases Change-Id: I1ba4fab361b77b1ec23b1773a66dccb76667e95c --- .../SpellCheckerForWorkPreferenceController.java | 4 +--- .../VirtualKeyboardForWorkPreferenceController.java | 4 +--- .../UserDictionaryForWorkPreferenceController.java | 10 ---------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java index 327af5b2bbc..7988a649852 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.inputmethod; import android.app.settings.SettingsEnums; import android.content.Context; -import android.view.inputmethod.InputMethodSystemProperty; import com.android.settings.R; import com.android.settings.core.WorkProfilePreferenceController; @@ -42,8 +41,7 @@ public final class SpellCheckerForWorkPreferenceController extends WorkProfilePr @AvailabilityStatus @Override public int getAvailabilityStatus() { - if (!mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings) - || !InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) { + if (!mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings)) { return UNSUPPORTED_ON_DEVICE; } return super.getAvailabilityStatus(); diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java index 6cdd386bb4a..fe81a945d1b 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.inputmethod; import android.app.settings.SettingsEnums; import android.content.Context; -import android.view.inputmethod.InputMethodSystemProperty; import com.android.settings.R; import com.android.settings.core.WorkProfilePreferenceController; @@ -39,8 +38,7 @@ public final class VirtualKeyboardForWorkPreferenceController @AvailabilityStatus @Override public int getAvailabilityStatus() { - if (!mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref) - || !InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) { + if (!mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref)) { return UNSUPPORTED_ON_DEVICE; } return super.getAvailabilityStatus(); diff --git a/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java b/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java index 7ff8aec36e4..5c1307248d4 100644 --- a/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.language; import android.app.settings.SettingsEnums; import android.content.Context; -import android.view.inputmethod.InputMethodSystemProperty; import com.android.settings.R; import com.android.settings.core.WorkProfilePreferenceController; @@ -39,13 +38,4 @@ public final class UserDictionaryForWorkPreferenceController protected int getSourceMetricsCategory() { return SettingsEnums.SETTINGS_LANGUAGE_CATEGORY; } - - @AvailabilityStatus - @Override - public int getAvailabilityStatus() { - if (!InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) { - return UNSUPPORTED_ON_DEVICE; - } - return super.getAvailabilityStatus(); - } }