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

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

Merge changes from topic "entity_ui" 

* changes:
  Do not show installation status on Q
  New UI design for entity header on Q
parents a9f2443f bbca29b6

res/layout-sw320dp/settings_entity_header.xml

deleted100644 → 0
+0 −113
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.

  -->



<!-- Entity header -->

<LinearLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="24dp"

    android:paddingBottom="24dp">



    <LinearLayout

        android:id="@+id/entity_header_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

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

        android:orientation="horizontal"

        android:paddingStart="56dp">



        <ImageView

            android:id="@+id/entity_header_icon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:scaleType="fitCenter"

            android:layout_gravity="center_horizontal"

            android:antialias="true" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:paddingStart="16dp"

            android:paddingEnd="16dp"

            android:orientation="vertical">



            <TextView

                android:id="@+id/entity_header_title"

                style="@style/TextAppearance.EntityHeaderTitle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:singleLine="false"

                android:ellipsize="marquee"

                android:gravity="start"

                android:textDirection="locale" />



            <TextView

                android:id="@+id/install_type"

                style="@style/TextAppearance.EntityHeaderSummary"

                android:visibility="gone"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>



            <TextView

                android:id="@+id/entity_header_summary"

                style="@style/TextAppearance.EntityHeaderSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



            <TextView

                android:id="@+id/entity_header_second_summary"

                style="@style/TextAppearance.EntityHeaderSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </LinearLayout>

    </LinearLayout>



    <LinearLayout

        android:id="@+id/entity_header_links"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <ImageButton

            android:id="@android:id/button1"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@null"

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



        <ImageButton

            android:id="@android:id/button2"

            style="?android:attr/actionOverflowButtonStyle"

            android:layout_width="wrap_content"

            android:layout_weight="1"

            android:layout_height="0dp"

            android:minWidth="@dimen/min_tap_target_size"

            android:src="@null"

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



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

res/layout/settings_entity_header.xml

+18 −18
Original line number Diff line number Diff line
@@ -16,60 +16,58 @@ 
  -->



<!-- Entity header -->

<LinearLayout

<RelativeLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingTop="24dp"

    android:paddingBottom="32dp"

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/entity_header_content"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

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

        android:layout_centerHorizontal="true"

        android:gravity="center_horizontal"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/entity_header_icon"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:layout_marginBottom="16dp"

            android:scaleType="fitXY"

            android:antialias="true"/>



        <TextView

            android:id="@+id/entity_header_title"

            style="@style/TextAppearance.EntityHeaderTitle"

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="false"

            android:ellipsize="marquee"

            android:gravity="start"

            android:textDirection="locale" />

            android:textDirection="locale"

            android:layout_marginTop="8dp"/>



        <TextView

            android:id="@+id/install_type"

            style="@style/TextAppearance.EntityHeaderSummary"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="2dp"/>



        <TextView

            android:id="@+id/entity_header_summary"

            style="@style/TextAppearance.EntityHeaderSummary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="2dp"/>



        <TextView

            android:id="@+id/entity_header_second_summary"

            style="@style/TextAppearance.EntityHeaderSummary"

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />



    </LinearLayout>
@@ -78,6 +76,8 @@ 
        android:id="@+id/entity_header_links"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

        android:layout_alignParentEnd="true"

        android:orientation="vertical">



        <ImageButton
@@ -102,4 +102,4 @@ 


    </LinearLayout>



</LinearLayout>
 
</RelativeLayout>

res/values/styles.xml

+6 −6
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ 


    <style name="TextAppearance.EntityHeaderTitle"

           parent="@android:style/TextAppearance.Material.Subhead">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textSize">20sp</item>

    </style>



    <style name="TextAppearance.EntityHeaderSummary"
@@ -331,6 +332,7 @@ 
        <item name="android:gravity">start</item>

        <item name="android:singleLine">true</item>

        <item name="android:ellipsize">marquee</item>

        <item name="android:textSize">14sp</item>

    </style>



    <style name="TextAppearance.ZenOnboardingButton">
@@ -397,12 +399,10 @@ 
    </style>



    <style name="EntityHeader">

        <item name="android:background">?android:attr/colorPrimary</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:paddingTop">16dp</item>

        <item name="android:paddingStart">16dp</item>

        <item name="android:background">?android:attr/colorPrimaryDark</item>

        <item name="android:paddingTop">24dp</item>

        <item name="android:paddingBottom">16dp</item>

        <item name="android:paddingEnd">16dp</item>

        <item name="android:paddingBottom">8dp</item>

    </style>



    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>

src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java

+0 −3
Original line number Diff line number Diff line
@@ -90,12 +90,9 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController 
    private void setAppLabelAndIcon(PackageInfo pkgInfo, AppEntry appEntry) {

        final Activity activity = mParent.getActivity();

        final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo);

        final CharSequence summary = isInstantApp

                ? null : mContext.getString(Utils.getInstallationStatus(appEntry.info));

        mEntityHeaderController

                .setLabel(appEntry)

                .setIcon(appEntry)

                .setSummary(summary)

                .setIsInstantApp(isInstantApp)

                .done(activity, false /* rebindActions */);

    }

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

+0 −3
Original line number Diff line number Diff line
@@ -235,10 +235,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
            controller.setLabel(mAppEntry);

            controller.setIcon(mAppEntry);

            boolean isInstantApp = AppUtils.isInstant(mAppEntry.info);

            CharSequence summary = isInstantApp

                    ? null : getString(Utils.getInstallationStatus(mAppEntry.info));

            controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));

            controller.setSummary(summary);

        }



        controller.done(context, true /* rebindActions */);