PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of PER_PROFILE_IME_ENABLED property in settings"

Browse Source
This commit is contained in:
Tarandeep Singh
2019-07-10 18:06:39 +00:00
committed by Android (Google) Code Review
parent 10829a2164 54c2af9213
commit 13d4aec8ff
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
View File

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

4
src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
View File

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

10
src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java
View File

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