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

Commit a2a42892 authored by Anna Zappone's avatar Anna Zappone Committed by Android (Google) Code Review
Browse files

Merge "Create & populate People Space activity"

parents 5dc9d972 d5a3ab0e

packages/SystemUI/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -572,6 +572,13 @@ 
            </intent-filter>

        </activity>



        <!-- People Space UI Screen -->

        <activity

            android:name=".people.PeopleSpaceActivity"

            android:exported="true"

            android:theme="@android:style/Theme.Material.NoActionBar">

        </activity>



        <!-- a gallery of delicious treats -->

        <service

            android:name=".DessertCaseDream"

packages/SystemUI/res/drawable/people_space_tile_view_card.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

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

    <solid android:color="@android:color/white" />

    <padding

        android:left="1dp"

        android:top="1dp"

        android:right="1dp"

        android:bottom="1dp" />

    <corners

        android:bottomRightRadius="7dp"

        android:bottomLeftRadius="7dp"

        android:topRightRadius="7dp"

        android:topLeftRadius="7dp" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/people_space_activity.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  -->

<androidx.core.widget.NestedScrollView

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

    android:id="@+id/scroll"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/holo_blue_light">



    <LinearLayout

        android:id="@+id/people_space_layout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

        android:orientation="vertical"

        android:padding="16dp"

        android:clipChildren="false"

        android:clipToPadding="false">



        <ImageView

            android:id="@+id/people_space_cloud"

            android:layout_width="67dp"

            android:layout_height="67dp"

            android:layout_gravity="center_horizontal"

            android:scaleType="fitCenter"

            android:focusable="false"

            android:paddingBottom="16dp"

            android:tint="?android:attr/colorControlNormal"

            android:src="@drawable/cloud" />



    </LinearLayout>

</androidx.core.widget.NestedScrollView>
 
 No newline at end of file

packages/SystemUI/res/layout/people_space_tile_view.xml

0 → 100644
+65 −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:id="@+id/tile_view"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:orientation="vertical"

        android:padding="16dp"

        android:layout_marginBottom="24dp"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:elevation="4dp"

        android:gravity="start">



        <ImageView

            android:id="@+id/tile_view_package_icon"

            android:layout_width="32dp"

            android:layout_height="32dp"

            android:layout_gravity="end" />



        <ImageView

            android:id="@+id/tile_view_person_icon"

            android:layout_width="32dp"

            android:layout_height="32dp"

            android:layout_gravity="start" />



        <TextView

            android:id="@+id/tile_view_name"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:paddingVertical="4dp"

            android:textSize="22sp"

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start" />



        <TextView

            android:id="@+id/tile_view_status"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:paddingVertical="4dp"

            android:textSize="16sp"

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:layout_gravity="start" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2834,4 +2834,10 @@ 
    <string name="build_number_clip_data_label">Build number</string>

    <!-- Text to display when copying the build number off QS [CHAR LIMIT=NONE]-->

    <string name="build_number_copy_toast">Build number copied to clipboard.</string>



    <!-- Status for last interaction [CHAR LIMIT=120] -->

    <string name="last_interaction_status" translatable="false">You last chatted <xliff:g id="duration" example="5 hours">%1$s</xliff:g> ago</string>

    <!-- Status for conversation without interaction data [CHAR LIMIT=120] -->

    <string name="basic_status" translatable="false">Open conversation</string>



</resources>