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

Commit 79dda907 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Weird floating "add language" item"

parents 5fe90a3f 29c15273

res/layout/locale_order_list.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipToPadding="true"

        android:clipChildren="true"

        android:orientation="vertical">



        <com.android.settings.localepicker.LocaleRecyclerView

res/layout/profile_select_tablayout.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:theme="@style/Theme.MaterialComponents.DayNight"

    android:clipToPadding="true"

    android:clipChildren="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

res/layout/time_zone_items_list.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2018 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.

  -->

<androidx.recyclerview.widget.RecyclerView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/recycler_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbars="vertical"/>

src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 
    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final View view = inflater.inflate(R.layout.time_zone_items_list, container, false);

        final View view = inflater.inflate(R.layout.recycler_view, container, false);

        mRecyclerView = view.findViewById(R.id.recycler_view);

        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext(),

                LinearLayoutManager.VERTICAL, /* reverseLayout */ false));