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

Commit c841e216 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Panlingual] Change Checkbox color and remove divider of listview" into... 

Merge "[Panlingual] Change Checkbox color and remove divider of listview" into tm-dev am: 12873579

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822477



Change-Id: Ibe1f6e171bfb0b2e9afc0e02dd7288f554bcc410
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3267218f 12873579

core/java/com/android/internal/app/LocalePickerWithRegion.java

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O 
        // In order to make the list view work with CollapsingToolbarLayout,

        // we have to enable the nested scrolling feature of the list view.

        getListView().setNestedScrollingEnabled(true);

        getListView().setDivider(null);

    }



    @Override

core/res/res/layout/app_language_picker_current_locale_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,6 +39,6 @@ 
            android:layout_width="24dp"

            android:layout_height="24dp"

            android:src="@drawable/ic_check_24dp"

            app:tint="#0F9D58"/>

            app:tint="?attr/colorAccentPrimaryVariant"/>

    </LinearLayout>

</LinearLayout>

core/res/res/layout/app_language_picker_system_current.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ 
            android:layout_width="24dp"

            android:layout_height="24dp"

            android:src="@drawable/ic_check_24dp"

            app:tint="#0F9D58"/>

            app:tint="?attr/colorAccentPrimaryVariant"/>

    </LinearLayout>

</LinearLayout>