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

Commit e519631a authored by Tony Huang's avatar Tony Huang Committed by android-build-merger
Browse files

Merge "Update layout make talkback first focus item is root button" into qt-dev am: a2141c1d 

am: c0297eb1

Change-Id: I46c1dc4d55e533bddbc2672af2c46837941d403d
parents 004ff172 c0297eb1

res/layout-sw720dp/action_bar_space.xml

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

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

-->

<merge />
 
 No newline at end of file

res/layout/action_bar_space.xml

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

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

-->

<android.widget.Space

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/action_bar_space_height"/>
 
 No newline at end of file

res/layout/directory_header.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/action_bar_space_margin"

    android:orientation="vertical">



    <!-- used for top padding. -->

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



    <!-- used for search chip. -->

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

res/values-sw720dp/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -28,4 +28,6 @@ 
    <dimen name="search_bar_text_margin_start">55dp</dimen>

    <dimen name="search_bar_text_margin_end">24dp</dimen>

    <dimen name="search_bar_icon_padding">16dp</dimen>



    <dimen name="action_bar_space_margin">0dp</dimen>

</resources>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
    <dimen name="action_bar_size">48dp</dimen>

    <!--This value should equal actionBarSize + (2 x search_bar_margin)-->

    <dimen name="action_bar_space_height">64dp</dimen>

    <dimen name="action_bar_space_margin">@dimen/action_bar_space_height</dimen>



    <dimen name="refresh_icon_range">64dp</dimen>

</resources>