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

Commit 9fcf0aac authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topics "people-space-screenshot", "screenshot-hardware" into tm-qpr-dev

* changes:
  Make the PeopleSpaceActivity screenshot testable
  Render View into Bitmap using hardware acceleration (1/2)
parents f2a5491f 8a169ff0
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ android_library {
        "androidx.arch.core_core-runtime",
        "androidx.lifecycle_lifecycle-common-java8",
        "androidx.lifecycle_lifecycle-extensions",
        "androidx.lifecycle_lifecycle-runtime-ktx",
        "androidx.dynamicanimation_dynamicanimation",
        "androidx-constraintlayout_constraintlayout",
        "androidx.exifinterface_exifinterface",
@@ -218,6 +219,7 @@ android_library {
        "androidx.arch.core_core-runtime",
        "androidx.lifecycle_lifecycle-common-java8",
        "androidx.lifecycle_lifecycle-extensions",
        "androidx.lifecycle_lifecycle-runtime-ktx",
        "androidx.dynamicanimation_dynamicanimation",
        "androidx-constraintlayout_constraintlayout",
        "androidx.exifinterface_exifinterface",
+6 −98
Original line number Diff line number Diff line
@@ -13,103 +13,11 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
<LinearLayout
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:id="@+id/top_level"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:padding="8dp">
    <TextView
        android:id="@+id/select_conversation_title"
        android:text="@string/select_conversation_title"
        android:gravity="center"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
        android:textColor="?android:attr/textColorPrimary"
        android:textSize="24sp"/>

    <TextView
        android:id="@+id/select_conversation"
        android:text="@string/select_conversation_text"
        android:gravity="center"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
        android:textColor="?android:attr/textColorPrimary"
        android:textSize="16sp"
        android:paddingVertical="24dp"
        android:paddingHorizontal="48dp"/>

    <androidx.core.widget.NestedScrollView
        android:id="@+id/scroll_view"
    android:id="@+id/container"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

        <LinearLayout
            android:id="@+id/scroll_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="16dp"
            android:orientation="vertical">

            <LinearLayout
                android:id="@+id/priority"
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="35dp">
                <TextView
                    android:id="@+id/priority_header"
                    android:text="@string/priority_conversations"
                    android:layout_width="wrap_content"
                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
                    android:textColor="?androidprv:attr/colorAccentPrimaryVariant"
                    android:textSize="14sp"
                    android:paddingStart="16dp"
                    android:layout_height="wrap_content"/>

                <LinearLayout
                    android:id="@+id/priority_tiles"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:orientation="vertical"
                    android:background="@drawable/rounded_bg_full_large_radius"
                    android:clipToOutline="true">
                </LinearLayout>
            </LinearLayout>

            <LinearLayout
                android:id="@+id/recent"
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TextView
                    android:id="@+id/recent_header"
                    android:gravity="start"
                    android:text="@string/recent_conversations"
                    android:layout_width="wrap_content"
                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
                    android:textColor="?androidprv:attr/colorAccentPrimaryVariant"
                    android:textSize="14sp"
                    android:paddingStart="16dp"
                    android:layout_height="wrap_content"/>

                <LinearLayout
                    android:id="@+id/recent_tiles"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:orientation="vertical"
                    android:background="@drawable/rounded_bg_full_large_radius"
                    android:clipToOutline="true">
                </LinearLayout>
            </LinearLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
</LinearLayout>
 No newline at end of file
    <!-- The content of people_space_activity_(no|with)_conversations.xml will be added here at
         runtime depending on the number of conversations to show. -->
</FrameLayout>
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
<RelativeLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:id="@+id/top_level"
    android:id="@+id/top_level_no_conversations"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:padding="24dp"
+115 −0
Original line number Diff line number Diff line
<!--
  ~ Copyright (C) 2022 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"
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
    android:id="@+id/top_level_with_conversations"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:padding="8dp">
    <TextView
        android:id="@+id/select_conversation_title"
        android:text="@string/select_conversation_title"
        android:gravity="center"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
        android:textColor="?android:attr/textColorPrimary"
        android:textSize="24sp"/>

    <TextView
        android:id="@+id/select_conversation"
        android:text="@string/select_conversation_text"
        android:gravity="center"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center_horizontal"
        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"
        android:textColor="?android:attr/textColorPrimary"
        android:textSize="16sp"
        android:paddingVertical="24dp"
        android:paddingHorizontal="48dp"/>

    <androidx.core.widget.NestedScrollView
        android:id="@+id/scroll_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <LinearLayout
            android:id="@+id/scroll_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="16dp"
            android:orientation="vertical">

            <LinearLayout
                android:id="@+id/priority"
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="35dp">
                <TextView
                    android:id="@+id/priority_header"
                    android:text="@string/priority_conversations"
                    android:layout_width="wrap_content"
                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
                    android:textColor="?androidprv:attr/colorAccentPrimaryVariant"
                    android:textSize="14sp"
                    android:paddingStart="16dp"
                    android:layout_height="wrap_content"/>

                <LinearLayout
                    android:id="@+id/priority_tiles"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:orientation="vertical"
                    android:background="@drawable/rounded_bg_full_large_radius"
                    android:clipToOutline="true">
                </LinearLayout>
            </LinearLayout>

            <LinearLayout
                android:id="@+id/recent"
                android:orientation="vertical"
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
                <TextView
                    android:id="@+id/recent_header"
                    android:gravity="start"
                    android:text="@string/recent_conversations"
                    android:layout_width="wrap_content"
                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
                    android:textColor="?androidprv:attr/colorAccentPrimaryVariant"
                    android:textSize="14sp"
                    android:paddingStart="16dp"
                    android:layout_height="wrap_content"/>

                <LinearLayout
                    android:id="@+id/recent_tiles"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="10dp"
                    android:orientation="vertical"
                    android:background="@drawable/rounded_bg_full_large_radius"
                    android:clipToOutline="true">
                </LinearLayout>
            </LinearLayout>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
</LinearLayout>
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@

            <ImageView
                android:id="@+id/tile_view_person_icon"
                android:layout_width="52dp"
                android:layout_height="52dp" />
                android:layout_width="@dimen/avatar_size_for_medium"
                android:layout_height="@dimen/avatar_size_for_medium" />

            <LinearLayout
                android:orientation="horizontal"
Loading