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

Commit d38e43b8 authored by Sunny Shao's avatar Sunny Shao
Browse files

[Catalyst] Initial migration for "Display size and text" screen 

Test: Manual
Bug: 372776688
Flag: com.android.settings.flags.catalyst_text_reading_screen
Change-Id: Iadbf36cee58083b8182ed5b275912a9e3a15b119
parent 1d28b612

src/com/android/settings/accessibility/TextReadingDisplaySizePreference.kt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.accessibility



import android.content.Context

import com.android.settings.R

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding



internal class TextReadingDisplaySizePreference : PreferenceMetadata, PreferenceBinding {



    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.screen_zoom_title



    override val summary: Int

        get() = R.string.screen_zoom_short_summary



    override val keywords: Int

        get() = R.string.keywords_display_size



    override fun createWidget(context: Context) =

        AccessibilitySeekBarPreference(context, /* attrs= */ null).apply {

            setIconStart(R.drawable.ic_remove_24dp)

            setIconStartContentDescription(R.string.screen_zoom_make_smaller_desc)

            setIconEnd(R.drawable.ic_add_24dp)

            setIconEndContentDescription(R.string.screen_zoom_make_larger_desc)

        }



    companion object {

        const val KEY = "display_size"

    }

}

src/com/android/settings/accessibility/TextReadingFontSizePreference.kt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.accessibility



import android.content.Context

import android.provider.Settings.System.FONT_SCALE

import com.android.settings.R

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding



internal class TextReadingFontSizePreference : PreferenceMetadata, PreferenceBinding {



    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.title_font_size



    override val summary: Int

        get() = R.string.short_summary_font_size



    override val keywords: Int

        get() = R.string.keywords_font_size



    override fun createWidget(context: Context) =

        AccessibilitySeekBarPreference(context, /* attrs= */ null).apply {

            setIconStart(R.drawable.ic_remove_24dp)

            setIconStartContentDescription(R.string.font_size_make_smaller_desc)

            setIconEnd(R.drawable.ic_add_24dp)

            setIconEndContentDescription(R.string.font_size_make_larger_desc)

        }



    companion object {

        const val KEY = FONT_SCALE

    }

}

src/com/android/settings/accessibility/TextReadingPreview.kt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.accessibility



import android.content.Context

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.preference.PreferenceBinding



internal class TextReadingPreview : PreferenceMetadata, PreferenceBinding {

    override val key: String

        get() = KEY



    override fun createWidget(context: Context) =

        TextReadingPreviewPreference(context).apply { isSelectable = false }



    companion object {

        const val KEY = "preview"

    }

}

src/com/android/settings/accessibility/TextReadingScreen.kt

+7 −5
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ package com.android.settings.accessibility 
import android.content.Context

import com.android.settings.R

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(TextReadingScreen.KEY)

// @ProvidePreferenceScreen(TextReadingScreen.KEY)

class TextReadingScreen : PreferenceScreenCreator {

    override val key: String

        get() = KEY
@@ -34,9 +33,12 @@ class TextReadingScreen : PreferenceScreenCreator { 


    override fun fragmentClass() = TextReadingPreferenceFragment::class.java



    override fun hasCompleteHierarchy() = false



    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) {}

    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

            +TextReadingPreview()

            +TextReadingFontSizePreference()

            +TextReadingDisplaySizePreference()

        }



    companion object {

        const val KEY = "text_reading_screen"