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

Commit 5703095c authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Physical Keyboard] update color of Dialog" into main

parents f9cf2b0a 5daef3cf

res/layout/dialog_keyboard_a11y_input_setting_keys.xml

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:progressBackgroundTint="@color/input_dialog_slider_progress_background"

                    android:progressTint="@color/input_dialog_slider_progress"

                    android:thumbTint="@color/input_dialog_slider_progress"

                    android:layout_marginTop="8dp"

                    android:visibility="gone"/>

            </LinearLayout>

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -86,5 +86,8 @@ 
    <!-- Volume seekbar colors -->

    <color name="seekbar_thumb_tint_color">@android:color/system_accent1_100</color>

    <color name="seekbar_progress_tint_color">@android:color/system_accent1_100</color>



    <!-- Keyboard a11y input dialog -->

    <color name="input_dialog_slider_progress">@android:color/system_on_primary_container_dark</color>

</resources>

res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -227,4 +227,8 @@ 
    <color name="seekbar_thumb_tint_color">@android:color/system_accent1_800</color>

    <color name="seekbar_progress_tint_color">@android:color/system_accent1_800</color>

    <color name="seekbar_progress_background_tint_color">@android:color/system_neutral2_50</color>



    <!-- Keyboard a11y input dialog -->

    <color name="input_dialog_slider_progress">@android:color/system_on_primary_dark</color>

    <color name="input_dialog_slider_progress_background">@android:color/system_outline_light</color>

</resources>

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

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ public class MouseKeysImageListAdapter extends 


    @Override

    public void onBindViewHolder(@NonNull MouseKeyImageViewHolder holder, int position) {

        if (mComposedSummaryList.isEmpty()) {

            return;

        }

        ((MouseKeyImageViewHolder) holder).bindView(DRAWABLE_LIST.get(position),

                mComposedSummaryList.get(position));

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public class MouseKeysMainPageFragment extends DashboardFragment 
        mMouseKeyImagesPreference = screen.findPreference(KEY_MOUSE_KEY_LIST);

        mInputManager = Preconditions.checkNotNull(getActivity()

                .getSystemService(InputManager.class));

        String title = mCurrentInputDevice == null ? getActivity().getString(R.string.mouse_keys)

        String title = mCurrentInputDevice == null || getHardKeyboards(getContext()).size() == 1

                ? getActivity().getString(R.string.mouse_keys)

                : getActivity().getString(R.string.mouse_key_main_page_title,

                        mCurrentInputDevice.getName());

        getActivity().setTitle(title);