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

Commit d5b48454 authored by Fan Zhang's avatar Fan Zhang
Browse files

Build a new FooterPreference UI. 

- Create a new layout for footer prefs.
- Create a new FooterPreference type to use the layout
- Create a Mixin to create and add the pref to screen
- Create a new lifecycle observer type to invoke mixin at right time
- Switch SettingsPreferenceFragment to use footer mixin.
- Switch FingerprintSettings to use the new footer pref.

Bug: 33579394
Test: RunSettingsRoboTests
Change-Id: I548ac39a0d120196a7ffed09b4f98bd9a80bae90
parent 1b89a9a4

res/drawable/ic_info_outline_24dp.xml

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

<!--

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

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/textColorSecondary">

    <path

        android:fillColor="#000000"

        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>

</vector>

res/layout/fingerprint_settings_footer.xml

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

<!--

  ~ Copyright (C) 2015 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

  -->

<com.android.settings.widget.LinkTextView

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

    style="@android:style/TextAppearance.Material.Body1"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textColor="?android:attr/textColorSecondary"

    android:paddingTop="32dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:selectable="false" />

res/layout/preference_footer.xml

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

<!--

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

  -->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:clipToPadding="false">



    <LinearLayout

        android:id="@+id/icon_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minWidth="60dp"

        android:gravity="start|center_vertical"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

    </LinearLayout>



    <com.android.settings.widget.LinkTextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingBottom="16dp"

        android:paddingTop="16dp"

        android:maxLines="10"

        android:textColor="?android:attr/textColorSecondary"

        android:ellipsize="marquee"/>



</LinearLayout>
 
 No newline at end of file

src/com/android/settings/SettingsPreferenceFragment.java

+5 −32
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.settings.applications.LayoutPreference; 
import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.instrumentation.Instrumentable;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.widget.FooterPreferenceMixin;

import com.android.settingslib.HelpUtils;



import java.util.UUID;
@@ -70,6 +71,9 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 


    private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";



    protected final FooterPreferenceMixin mFooterPreferenceMixin =

            new FooterPreferenceMixin(this, getLifecycle());



    private SettingsDialogFragment mDialogFragment;



    private String mHelpUri;
@@ -123,7 +127,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 


    private LayoutPreference mHeader;



    private LayoutPreference mFooter;

    private View mEmptyView;

    private LinearLayoutManager mLayoutManager;

    private HighlightablePreferenceGroupAdapter mAdapter;
@@ -277,10 +280,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
        return mHeader;

    }



    public LayoutPreference getFooterView() {

        return mFooter;

    }



    protected void setHeaderView(int resource) {

        mHeader = new LayoutPreference(getPrefContext(), resource);

        addPreferenceToTop(mHeader);
@@ -298,29 +297,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
        }

    }



    protected void setFooterView(int resource) {

        setFooterView(resource != 0 ? new LayoutPreference(getPrefContext(), resource) : null);

    }



    protected void setFooterView(View v) {

        setFooterView(v != null ? new LayoutPreference(getPrefContext(), v) : null);

    }



    private void setFooterView(LayoutPreference footer) {

        if (getPreferenceScreen() != null && mFooter != null) {

            getPreferenceScreen().removePreference(mFooter);

        }

        if (footer != null) {

            mFooter = footer;

            mFooter.setOrder(ORDER_LAST);

            if (getPreferenceScreen() != null) {

                getPreferenceScreen().addPreference(mFooter);

            }

        } else {

            mFooter = null;

        }

    }



    @Override

    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {

        if (preferenceScreen != null && !preferenceScreen.isAttached()) {
@@ -332,9 +308,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
            if (mHeader != null) {

                preferenceScreen.addPreference(mHeader);

            }

            if (mFooter != null) {

                preferenceScreen.addPreference(mFooter);

            }

        }

    }
@@ -343,7 +316,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
        if (getPreferenceScreen() != null) {

            boolean show = (getPreferenceScreen().getPreferenceCount()

                    - (mHeader != null ? 1 : 0)

                    - (mFooter != null ? 1 : 0)) <= 0;

                    - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0;

            mEmptyView.setVisibility(show ? View.VISIBLE : View.GONE);

        } else {

            mEmptyView.setVisibility(View.VISIBLE);

src/com/android/settings/applications/ApplicationFeatureProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public interface ApplicationFeatureProvider { 
    /**

     * Callback that receives the total number of packages installed on the device.

     */

    public interface NumberOfInstalledAppsCallback {

    interface NumberOfInstalledAppsCallback {

        void onNumberOfInstalledAppsResult(int num);

    }

}