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

Commit b9d34b38 authored by Kevin Hufnagle's avatar Kevin Hufnagle Committed by android-build-merger
Browse files

Merge \\"docs: Added note about limited support for hardware key... 

Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc6
am: 7703ce2d

Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
parents ed5ce4a7 7703ce2d

packages/SystemUI/res/layout/qs_detail.xml

+3 −2
Original line number Diff line number Diff line
@@ -47,11 +47,12 @@ 
    <com.android.systemui.qs.NonInterceptingScrollView

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1">

        android:layout_weight="1"

        android:fillViewport="true">

        <FrameLayout

            android:id="@android:id/content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

            android:layout_height="match_parent"/>

    </com.android.systemui.qs.NonInterceptingScrollView>



    <include layout="@layout/qs_detail_buttons" />

packages/SystemUI/res/layout/qs_detail_items.xml

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

-->

<!-- extends FrameLayout -->

<com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.systemui.qs.QSDetailItems

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -32,10 +33,10 @@ 


    <LinearLayout

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:gravity="center_horizontal"

        android:gravity="center"

        android:orientation="vertical">



        <ImageView

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+1 −1
Original line number Diff line number Diff line
@@ -368,5 +368,5 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
            }

            mItems.setItems(items);

        }

    };

    }

}