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

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

Merge "Remove drawer code from settings"

parents 1e731c53 f1c1bb49

packages/SettingsLib/res/layout/drawer_category.xml

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="8dp"

    android:orientation="vertical">



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

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



    <TextView

        style="@style/TextAppearanceSmall"

        android:id="@android:id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingStart="16dp" />



</LinearLayout>

packages/SettingsLib/res/layout/drawer_item.xml

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

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

    android:id="@+id/tile_item"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="48dp"

    android:orientation="horizontal" >



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="@dimen/drawer_icon_size"

        android:layout_height="@dimen/drawer_icon_size"

        android:layout_marginStart="@dimen/drawer_icon_margin"

        android:layout_marginEnd="@dimen/drawer_icon_margin"

        android:layout_marginTop="@dimen/drawer_item_top_bottom_margin"

        android:layout_marginBottom="@dimen/drawer_item_top_bottom_margin"

        android:scaleType="fitCenter"

        android:layout_gravity="center_vertical"

        android:tint="?android:attr/colorAccent"/>



    <TextView

        android:textAppearance="@style/TextAppearanceMedium"

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:textColor="?android:attr/colorControlNormal" />



</LinearLayout>

packages/SettingsLib/res/layout/drawer_spacer.xml

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

    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.

-->

<Space

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

    android:id="@+id/spacer"

    android:layout_width="match_parent"

    android:layout_height="@dimen/drawer_spacer_height" />

packages/SettingsLib/res/layout/settings_with_drawer.xml

+0 −9
Original line number Diff line number Diff line
@@ -47,13 +47,4 @@ 
            android:layout_height="fill_parent"

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

    </LinearLayout>

    <!-- The navigation drawer -->

    <ListView android:id="@+id/left_drawer"

        android:layout_width="@dimen/drawer_width"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:choiceMode="singleChoice"

        android:divider="@android:color/transparent"

        android:dividerHeight="0dp"

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

</android.support.v4.widget.DrawerLayout>

packages/SettingsLib/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
    <!-- Whether to send a custom package name with the PSD.-->

    <bool name="config_sendPackageName">false</bool>



    <!-- Whether to enable the left nav drawer in all Settings UI.-->

    <bool name="config_enable_nav_drawer">false</bool>



    <!-- Name for the set of keys associating package names -->

    <string name="config_helpPackageNameKey" translatable="false"></string>