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

Commit 44aab7c5 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Refine the homepage app bar layout" into tm-dev

parents 13438e60 8847c318

res/drawable/homepage_app_bar_background.xml

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

<!--

  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.

  -->

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

       android:shape="rectangle">

    <solid

        android:color="@color/settings_two_pane_background_color" />

    <corners

        android:bottomLeftRadius="@dimen/homepage_app_bar_corner_radius"

        android:bottomRightRadius="@dimen/homepage_app_bar_corner_radius" />

</shape>
 
 No newline at end of file

res/layout/search_bar_two_pane_version.xml

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
    android:layout_width="0dp"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:layout_marginEnd="@dimen/search_bar_margin"

    android:layout_marginVertical="@dimen/search_bar_margin">

    android:layout_marginEnd="@dimen/search_bar_margin">

    <Toolbar

        android:id="@+id/search_action_bar_two_pane"

        android:layout_width="match_parent"

res/layout/settings_homepage_app_bar_two_pane_layout.xml

+13 −21
Original line number Diff line number Diff line
@@ -17,20 +17,13 @@ 


<LinearLayout

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

    android:id="@+id/app_bar_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:background="@color/settings_two_pane_background_color">



    <FrameLayout

        android:id="@+id/two_pane_suggestion_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">

    android:layout_marginHorizontal="@dimen/homepage_app_bar_margin_horizontal_two_pane"

    android:padding="@dimen/homepage_app_bar_padding_two_pane"

    android:orientation="horizontal"

    android:background="@drawable/homepage_app_bar_background">



    <include layout="@layout/search_bar_two_pane_version"/>
@@ -40,6 +33,5 @@ 
        android:layout_height="@dimen/avatar_length"

        android:layout_gravity="center"

        android:contentDescription="@string/search_bar_account_avatar_content_description"/>

    </LinearLayout>



</LinearLayout>

res/layout/settings_homepage_container.xml

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ 
            android:layout_height="wrap_content"

            android:orientation="vertical">



            <include

                android:id="@+id/suggestion_container_two_pane"

                layout="@layout/suggestion_container_two_pane"

                android:visibility="gone"/>



            <FrameLayout

                android:id="@+id/contextual_cards_content"

                android:layout_width="match_parent"

res/layout/suggestion_container_two_pane.xml

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

<!--

     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.

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/homepage_app_bar_margin_bottom_two_pane"

    android:layout_marginHorizontal="@dimen/homepage_padding_horizontal_two_pane">



    <FrameLayout

        android:id="@+id/two_pane_suggestion_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" />



</FrameLayout>