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

Commit 085028d7 authored by Noah Wang's avatar Noah Wang
Browse files

Add dot page indicator to preview screen pager. 

Change-Id: I4fa5aba28ad20be17bd5fa8d3c6a06d8a9a4a64a
parent 99b7b12e

res/layout/font_size_activity.xml

+9 −1
Original line number Diff line number Diff line
@@ -35,12 +35,20 @@ 
            android:background="?android:attr/colorBackgroundFloating"

            android:elevation="2dp" />



        <com.android.settings.widget.DotsPageIndicator

            android:id="@+id/page_indicator"

            style="@style/PreviewPagerPageIndicator"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="6dp" />



        <TextView

            android:id="@+id/current_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="8dp"

            android:padding="6dp"

            android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

            android:elevation="2dp" />

res/layout/screen_zoom_activity.xml

+10 −3
Original line number Diff line number Diff line
@@ -35,20 +35,27 @@ 
            android:background="?android:attr/colorBackgroundFloating"

            android:elevation="2dp" />



        <com.android.settings.widget.DotsPageIndicator

            android:id="@+id/page_indicator"

            style="@style/PreviewPagerPageIndicator"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="6dp" />



        <TextView

            android:id="@+id/current_label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"

            android:padding="8dp"

            android:padding="6dp"

            android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

            android:elevation="2dp" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

            android:paddingTop="8dp">

            android:gravity="center_vertical">



            <ImageView

                android:id="@+id/smaller"

res/values/attrs.xml

+9 −0
Original line number Diff line number Diff line
@@ -100,6 +100,15 @@ 
        <attr name="keywords" format="string" />

    </declare-styleable>



    <!-- For DotsPageIndicator -->

    <declare-styleable name="DotsPageIndicator">

        <attr name="dotDiameter" format="dimension" />

        <attr name="dotGap" format="dimension" />

        <attr name="animationDuration" format="integer" />

        <attr name="pageIndicatorColor" format="color" />

        <attr name="currentPageIndicatorColor" format="color" />

    </declare-styleable>



    <attr name="switchBarTheme" format="reference" />

    <attr name="switchBarMarginStart" format="dimension" />

    <attr name="switchBarMarginEnd" format="dimension" />

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -358,4 +358,10 @@ 
    <style name="SetupWizardStorageStyle" parent="@style/SuwThemeMaterial.Light">

        <item name="android:colorAccent">#ff009688</item>

    </style>



    <style name="PreviewPagerPageIndicator">

        <item name="dotGap">8dp</item>

        <item name="pageIndicatorColor">@android:color/tertiary_text_light</item>

        <item name="currentPageIndicatorColor">@android:color/primary_text_light</item>

    </style>

</resources>

src/com/android/settings/PreviewSeekBarPreferenceFragment.java

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.view.ViewGroup; 
import android.widget.SeekBar;

import android.widget.SeekBar.OnSeekBarChangeListener;

import android.widget.TextView;

import com.android.settings.widget.DotsPageIndicator;





/**
@@ -131,6 +132,15 @@ public abstract class PreviewSeekBarPreferenceFragment extends SettingsPreferenc 
        mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager);

        mPreviewPager.setAdapter(mPreviewPagerAdapter);



        final DotsPageIndicator pageIndicator =

                (DotsPageIndicator) content.findViewById(R.id.page_indicator);

        if (mPreviewSampleResIds.length > 1) {

            pageIndicator.setViewPager(mPreviewPager);

            pageIndicator.setVisibility(View.VISIBLE);

        } else {

            pageIndicator.setVisibility(View.GONE);

        }



        setPreviewLayer(mInitialIndex, false);

        return root;

    }