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

Commit 170db4c8 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Delete the old implementation of PeopleSpaceActivity 

This CL deletes the old code of the PeopleSpaceActivity. The new Compose
implementation has been enabled since September in ag/24789231.

Bug: 293570761
Test: N/A. Pure code deletion.
Flag: EXEMPT deletes unused code turned off by legacy flag.
Change-Id: I1feac430788714274f63acf2bddb3ba987e2f67d
parent 14cf65b2

packages/SystemUI/res/drawable/rounded_bg_full_large_radius.xml

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

<!-- Copyright (C) 2021 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"

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

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

    <corners android:radius="40dp" />

</shape>

packages/SystemUI/res/layout/people_space_activity.xml

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

  -->

<FrameLayout

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

    android:id="@+id/container"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <!-- 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>

packages/SystemUI/res/layout/people_space_activity_list_divider.xml

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

<!--

     Copyright (C) 2021 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.

-->

<View

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

    android:layout_width="match_parent"

    android:layout_height="2dp"

    android:background="?android:attr/colorBackground" />

packages/SystemUI/res/layout/people_space_activity_no_conversations.xml

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2021 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.

  -->

<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_no_conversations"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:padding="24dp"

    android:clipToOutline="true">

    <TextView

        android:id="@+id/select_conversation_title"

        android:gravity="center"

        android:text="@string/select_conversation_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

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

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

        android:textSize="24sp"

        android:layout_alignParentTop="true" />



    <TextView

        android:id="@+id/select_conversation"

        android:gravity="center"

        android:text="@string/no_conversations_text"

        android:layout_width="match_parent"

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

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

        android:textSize="16sp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:padding="24dp"

        android:layout_marginTop="26dp"

        android:layout_below="@id/select_conversation_title"/>



    <Button

        style="?android:attr/buttonBarButtonStyle"

        android:id="@+id/got_it_button"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:background="@drawable/rounded_bg_full_large_radius"

        android:text="@string/got_it"

        android:textColor="?androidprv:attr/textColorOnAccent"

        android:layout_marginBottom="60dp"

        android:layout_alignParentBottom="true" />



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_above="@id/got_it_button"

        android:layout_below="@id/select_conversation"

        android:layout_centerInParent="true"

        android:clipToOutline="true">

        <LinearLayout

            android:id="@+id/widget_initial_layout"

            android:layout_width="200dp"

            android:layout_height="100dp"

            android:layout_gravity="center"

            android:background="@drawable/rounded_bg_full_large_radius"

            android:layout_above="@id/got_it_button">

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

        </LinearLayout>

    </LinearLayout>

</RelativeLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_space_activity_with_conversations.xml

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