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

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

Merge "Fix overlapping problem on running services page" into sc-dev

parents 09666f9e ff0c73bf

res/layout/manage_applications_running.xml

+7 −6
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

res/layout/running_processes_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

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

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

    android:orientation="vertical">

res/layout/running_processes_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_toStartOf="@id/widget_summary"

        layout="@layout/preference_app"/>

        layout="@layout/running_services_app_item"/>

</RelativeLayout>
 
 No newline at end of file

res/layout/running_processes_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
            android:paddingEnd="0dp"

            android:drawSelectorOnTop="false"

            android:scrollbarStyle="outsideOverlay"

            android:nestedScrollingEnabled="true"

            android:fastScrollEnabled="true"/>

        <TextView

            android:id="@android:id/empty"

res/layout/running_services_app_item.xml

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

<!--

  Copyright (C) 2020 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:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

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

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

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



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:minWidth="@dimen/secondary_app_icon_size"

        android:orientation="horizontal"

        android:paddingEnd="16dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <ImageView

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

            android:layout_width="@dimen/secondary_app_icon_size"

            android:layout_height="@dimen/secondary_app_icon_size"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:maxLines="2"

            android:textAppearance="?android:attr/textAppearanceListItem"/>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textDirection="locale"

            android:textAppearance="?android:attr/textAppearanceSmall"

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



    </LinearLayout>



</LinearLayout>