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

Commit cafda1f9 authored by Jason Monk's avatar Jason Monk
Browse files

Settings drawer work 

 - Final visuals
 - Show under status bar
 - Fix activity flow surrounding drawer use

Change-Id: I161702219c26cabc6b2d1adbaa6fbfb1d9fd5b07
parent e64f3da7

packages/SettingsLib/res/drawable/home.xml

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

-->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M10.0,20.0l0.0,-6.0l4.0,0.0l0.0,6.0l5.0,0.0l0.0,-8.0l3.0,0.0L12.0,3.0 2.0,12.0l3.0,0.0l0.0,8.0z"/>

</vector>

packages/SettingsLib/res/layout/drawer_category.xml

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
    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
@@ -27,9 +28,9 @@ 
    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:layout_height="48dp"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingStart="16dp"

        android:textAppearance="?android:attr/textAppearanceSmall" />

packages/SettingsLib/res/layout/drawer_spacer.xml

0 → 100644
+20 −0
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="32dp" />

packages/SettingsLib/res/layout/settings_with_drawer.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
        android:id="@+id/content_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical" >

        android:orientation="vertical"

        android:fitsSystemWindows="false" >

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -35,6 +36,7 @@ 
                android:layout_height="wrap_content"

                android:navigationContentDescription="@*android:string/action_bar_up_description"

                android:theme="?android:attr/actionBarTheme"

                android:paddingTop="@*android:dimen/status_bar_height"

                style="?android:attr/toolbarStyle"

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

        </FrameLayout>

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -768,4 +768,7 @@ 
    <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->

    <string name="disabled_by_admin_summary_text">Disabled by administrator</string>



    <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->

    <string name="home">Home</string>



</resources>