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

Commit 39b297fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "refactor: Move text reading related preferences under textreading folder" into main

parents 9986c0d0 40550e56

src/com/android/settings/accessibility/TextReadingPreferenceFragment.java

+0 −7
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import android.view.View; 
import android.widget.Toast;



import androidx.annotation.IntDef;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;



import com.android.graphics.hwui.flags.Flags;
@@ -316,9 +314,4 @@ public class TextReadingPreferenceFragment extends BaseSupportFragment { 


    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.accessibility_text_reading_options);



    @Override

    public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) {

        return TextReadingScreen.KEY;

    }

}

src/com/android/settings/accessibility/TextReadingDisplaySizePreference.kt→src/com/android/settings/accessibility/textreading/ui/TextReadingDisplaySizePreference.kt

+2 −1
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
 * limitations under the License.

 */



package com.android.settings.accessibility

package com.android.settings.accessibility.textreading.ui



import android.content.Context

import com.android.settings.R

import com.android.settings.accessibility.TooltipSliderPreference

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding

src/com/android/settings/accessibility/TextReadingFontSizePreference.kt→src/com/android/settings/accessibility/textreading/ui/TextReadingFontSizePreference.kt

+2 −1
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 * limitations under the License.

 */



package com.android.settings.accessibility

package com.android.settings.accessibility.textreading.ui



import android.content.Context

import android.provider.Settings.System.FONT_SCALE

import com.android.settings.R

import com.android.settings.accessibility.TooltipSliderPreference

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding

src/com/android/settings/accessibility/TextReadingPreview.kt→src/com/android/settings/accessibility/textreading/ui/TextReadingPreview.kt

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
 * limitations under the License.

 */



package com.android.settings.accessibility

package com.android.settings.accessibility.textreading.ui



import android.content.Context

import com.android.settings.accessibility.TextReadingPreviewPreference

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding
@@ -25,7 +26,7 @@ internal class TextReadingPreview : PreferenceMetadata, PreferenceBinding { 
        get() = KEY



    override fun createWidget(context: Context) =

        TextReadingPreviewPreference(context).apply { isSelectable = false }

        TextReadingPreviewPreference(context, /* attrs= */ null).apply { isSelectable = false }



    companion object {

        const val KEY = "preview"

src/com/android/settings/accessibility/TextReadingScreen.kt→src/com/android/settings/accessibility/textreading/ui/TextReadingScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.settings.accessibility

package com.android.settings.accessibility.textreading.ui



import android.app.settings.SettingsEnums

import android.content.Context

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.accessibility.TextReadingPreferenceFragment

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.preferenceHierarchy