Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90e70b15 authored by shaoweishen's avatar shaoweishen Committed by Shaowei Shen
Browse files

[Physical Keyboard] Clean up old ui and flag 

Change-Id: I9423d0e9debcef37338e5733aab56b98920621e3

Test: n/a
Bug: 330517633
Change-Id: I485848f67e0eb3ab207413a6ed8f7de809f80c5c
parent 3a1252eb

res/xml/system_dashboard_fragment.xml

+0 −8
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ 
    android:key="system_dashboard_screen"

    android:title="@string/header_category_system">



    <Preference

        android:key="language_input_settings"

        android:title="@string/language_settings"

        android:icon="@drawable/ic_settings_language"

        android:order="-260"

        android:fragment="com.android.settings.language.LanguageAndInputSettings"

        settings:controller="com.android.settings.language.LanguageAndInputPreferenceController"/>



    <Preference

        android:key="language_settings"

        android:title="@string/languages_settings"

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −2
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ import com.android.settings.inputmethod.SpellCheckersSettings; 
import com.android.settings.inputmethod.TrackpadSettings;

import com.android.settings.inputmethod.UserDictionaryList;

import com.android.settings.inputmethod.UserDictionarySettings;

import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.language.LanguageSettings;

import com.android.settings.localepicker.LocaleListEditor;

import com.android.settings.location.LocationServices;
@@ -226,7 +225,6 @@ public class SettingsGateway { 
            DateTimeSettings.class.getName(),

            LocaleListEditor.class.getName(),

            AvailableVirtualKeyboardFragment.class.getName(),

            LanguageAndInputSettings.class.getName(),

            LanguageSettings.class.getName(),

            KeyboardSettings.class.getName(),

            ModifierKeysSettings.class.getName(),

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+0 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; 
import com.android.settings.fuelgauge.batteryusage.PowerUsageSummary;

import com.android.settings.gestures.GestureSettings;

import com.android.settings.homepage.TopLevelSettings;

import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.notification.ConfigureNotificationSettings;

import com.android.settings.notification.SoundSettings;
@@ -102,8 +101,6 @@ public class DashboardFragmentRegistry { 
                CategoryKey.CATEGORY_ACCOUNT);

        PARENT_TO_CATEGORY_KEY_MAP.put(

                SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);

        PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(),

                CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        // TODO(b/242680328) Tie new category key to LanguageSettings and KeyboardSettings page

        PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettingsDashboardFragment.class.getName(),

                CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

src/com/android/settings/inputmethod/KeyboardPreferenceController.java

+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.inputmethod; 


import android.content.Context;

import android.hardware.input.InputManager;

import android.util.FeatureFlagUtils;



import androidx.preference.Preference;
@@ -78,9 +77,7 @@ public class KeyboardPreferenceController extends BasePreferenceController 


    @Override

    public int getAvailabilityStatus() {

        return FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI)

                ? AVAILABLE

                : CONDITIONALLY_UNAVAILABLE;

        return AVAILABLE;

    }



    private void updateSummary() {

src/com/android/settings/inputmethod/KeyboardSettings.java

+1 −8
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.os.Bundle;

import android.util.FeatureFlagUtils;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -111,11 +110,5 @@ public class KeyboardSettings extends DashboardFragment { 
    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.keyboard_settings) {

                @Override

                protected boolean isPageSearchEnabled(Context context) {

                    return FeatureFlagUtils

                            .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_UI);

                }

            };

            new BaseSearchIndexProvider(R.xml.keyboard_settings);

}
 
 No newline at end of file