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

Commit 1900be43 authored by Peter_Liang's avatar Peter_Liang Committed by PETER LIANG
Browse files

New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (10/n). 

1) Add a new text reading preference fragment for SetupWizard.
2) Add the entry into the vision settings, and temporarily set the visibility as gone.

Bug: 211503117
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentForSetupWizardTest
Change-Id: I5582d79672a9a9a375a79dbdf3a2055e7d785269
parent d3fe360d

res/xml/accessibility_settings_for_setup_wizard.xml

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,15 @@ 
    android:persistent="true"

    android:title="@string/vision_settings_title">



    <Preference

        android:fragment="com.android.settings.accessibility.TextReadingPreferenceFragmentForSetupWizard"

        android:icon="@drawable/ic_adaptive_font_download"

        android:key="text_reading_options"

        android:persistent="false"

        android:title="@string/accessibility_text_reading_options_title"

        settings:isPreferenceVisible="false"

        settings:keywords="text_reading_options" />



    <Preference

        android:key="font_size_preference"

        android:icon="@drawable/ic_font_size"

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

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

 * Copyright (C) 2022 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.graphics.drawable.Drawable;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;



import androidx.recyclerview.widget.RecyclerView;



import com.android.settings.R;

import com.android.settingslib.Utils;



import com.google.android.setupdesign.GlifPreferenceLayout;



/**

 * A {@link androidx.preference.PreferenceFragmentCompat} that displays the settings page related

 * to the text and reading option in the SetupWizard.

 */

public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPreferenceFragment {



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



        final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;

        final String title = getContext().getString(

                R.string.accessibility_text_reading_options_title);

        final Drawable icon = getContext().getDrawable(R.drawable.ic_font_download);

        icon.setTintList(Utils.getColorAttr(getContext(), android.R.attr.colorPrimary));

        AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,

                /* description= */ null, icon);

    }



    @Override

    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,

            Bundle savedInstanceState) {

        final GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;

        return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);

    }



    @Override

    public int getMetricsCategory() {

        return super.getMetricsCategory();

    }



    @Override

    public int getHelpResource() {

        // Hides help center in action bar and footer bar in SuW

        return 0;

    }

}

tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java

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

 * Copyright (C) 2022 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 static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.content.Context;



import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;



import com.google.android.setupdesign.GlifPreferenceLayout;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;



/**

 * Tests for {@link TextReadingPreferenceFragmentForSetupWizard}.

 */

@RunWith(RobolectricTestRunner.class)

public class TextReadingPreferenceFragmentForSetupWizardTest {



    private final Context mContext = spy(ApplicationProvider.getApplicationContext());

    @Mock

    private GlifPreferenceLayout mGlifLayoutView;

    private TextReadingPreferenceFragmentForSetupWizard mFragment;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mFragment = spy(new TextReadingPreferenceFragmentForSetupWizard());

    }



    @Test

    public void setHeaderText_onViewCreated_verifyAction() {

        final String title = "title";

        doReturn(mContext).when(mFragment).getContext();

        doReturn(title).when(mContext).getString(

                R.string.accessibility_text_reading_options_title);



        mFragment.onViewCreated(mGlifLayoutView, null);



        verify(mGlifLayoutView).setHeaderText(title);

    }

}