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

Commit 05cb1e14 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Add customized cross profiles settings header"

parents 9af43810 ff8a5171

core/proto/android/app/settings_enums.proto

+3 −0
Original line number Diff line number Diff line
@@ -2578,4 +2578,7 @@ enum PageId { 
    // CATEGORY: SETTINGS

    // OS: R

    CONNECTION_DEVICE_ADVANCED_NFC = 1828;



    // OPEN: Settings -> Apps & Notifications -> Special App Access

    INTERACT_ACROSS_PROFILES = 1829;

}

packages/SettingsLib/LayoutPreference/res/drawable/ic_swap_horiz_blue.xml

0 → 100644
+25 −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.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"

      android:fillColor="#4285F4"/>

</vector>

packages/SettingsLib/LayoutPreference/res/drawable/ic_swap_horiz_grey.xml

0 → 100644
+25 −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.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z"

      android:fillColor="#757575"/>

</vector>

packages/SettingsLib/LayoutPreference/res/layout/cross_profiles_settings_entity_header.xml

0 → 100644
+92 −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.

  -->



<RelativeLayout

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

    android:id="@+id/entity_header"

    style="@style/EntityHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

    android:orientation="horizontal">



    <LinearLayout

        android:id="@+id/entity_header_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:gravity="center_horizontal"

        android:orientation="horizontal">



        <LinearLayout

            android:id="@+id/entity_header_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerHorizontal="true"

            android:gravity="center_horizontal"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/entity_header_icon_personal"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:scaleType="fitCenter"

                android:antialias="true"/>



            <TextView

                android:id="@+id/install_type"

                style="@style/TextAppearance.EntityHeaderSummary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="2dp"

                android:text="Personal"/>

        </LinearLayout>



        <ImageView

            android:id="@+id/entity_header_swap_horiz"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:scaleType="fitCenter"

            android:antialias="true"

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



        <LinearLayout

            android:id="@+id/entity_header_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerHorizontal="true"

            android:gravity="center_horizontal"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/entity_header_icon_work"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:scaleType="fitCenter"

                android:antialias="true"/>

            <TextView

                android:id="@+id/install_type"

                style="@style/TextAppearance.EntityHeaderSummary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="2dp"

                android:text="Work"/>

        </LinearLayout>

    </LinearLayout>



</RelativeLayout>