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

Commit a0cf877c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove drawer from settings"

parents 80513838 78ab9f98

res/layout/dashboard_container.xml

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

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

-->



<com.android.settings.widget.RtlCompatibleViewPager

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

        android:id="@+id/pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

res/layout/dashboard_container_header.xml

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

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

-->



<com.android.settings.widget.SlidingTabLayout

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

    android:id="@+id/sliding_tabs"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginStart="@dimen/dashboard_header_margin_start"

    android:layout_marginEnd="@dimen/dashboard_header_margin_end"/>

res/values-sw720dp-land/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
    <dimen name="dashboard_padding_start">160dp</dimen>

    <dimen name="dashboard_padding_end">160dp</dimen>



    <!-- Dashboard Header margin in its container -->

    <dimen name="dashboard_header_margin_start">304dp</dimen>

    <dimen name="dashboard_header_margin_end">304dp</dimen>



    <!-- ActionBar contentInsetStart -->

    <dimen name="actionbar_contentInsetStart">128dp</dimen>

    <dimen name="actionbar_subsettings_contentInsetStart">128dp</dimen>

res/values-sw720dp/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
    <dimen name="dashboard_padding_start">80dp</dimen>

    <dimen name="dashboard_padding_end">80dp</dimen>



    <!-- Dashboard Header margin in its container -->

    <dimen name="dashboard_header_margin_start">176dp</dimen>

    <dimen name="dashboard_header_margin_end">176dp</dimen>



    <!-- Dashboard category padding start / end -->

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

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

res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ 
    <dimen name="dashboard_padding_top">0dp</dimen>

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



    <!-- Dashboard Header margin in its container -->

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

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



    <!-- Dashboard category padding start / end -->

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

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