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

Commit 75362101 authored by Joe Onorato's avatar Joe Onorato
Browse files

Tweak the settings panel assets / layout. Not done yet. 

Change-Id: Ib014947f1260cb290818b7af0151fe0c165950c6
parent 2e585f7e

packages/SystemUI/res/drawable-mdpi/scrubber_control_holo.png

0 → 100644
+4.65 KiB
Loading image diff...

packages/SystemUI/res/drawable/status_bar_toggle_button.xml

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

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

-->



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

    <item android:state_checked="true"

         android:drawable="@*android:drawable/scrubber_primary_holo" />

    <item

         android:drawable="@*android:drawable/scrubber_track_holo_dark" />

</selector>

packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml

+16 −7
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ 


<com.android.systemui.statusbar.tablet.SettingsView

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

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:background="@drawable/status_bar_item_background"

        android:paddingLeft="16dp"

        android:paddingRight="46dp"

        >



    <!-- Airplane mode -->
@@ -39,11 +41,12 @@ 
                style="@style/StatusBarPanelSettingsContents"

                android:text="@string/status_bar_settings_airplane"

                />

        <CheckBox

        <Switch

                android:id="@+id/airplane_checkbox"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginRight="5dp"

                />

    </LinearLayout>

    <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -67,7 +70,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:layout_marginTop="16dp"

            android:layout_marginRight="8dp"

            android:layout_marginRight="2dp"

            android:src="@drawable/ic_notification_open"

            />

    </LinearLayout>
@@ -88,11 +91,12 @@ 
                style="@style/StatusBarPanelSettingsContents"

                android:text="@string/status_bar_settings_rotation_lock"

                />

        <CheckBox

        <Switch

                android:id="@+id/rotate_checkbox"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginRight="5dp"

                />

    </LinearLayout>

    <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -107,8 +111,10 @@ 
        <com.android.systemui.statusbar.policy.ToggleSlider

                android:id="@+id/brightness"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_height="fill_parent"

                android:layout_weight="1"

                android:layout_marginRight="2dp"

                systemui:text="@string/status_bar_settings_auto_brightness_label"

                />

    </LinearLayout>

    <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -123,8 +129,10 @@ 
        <com.android.systemui.statusbar.policy.ToggleSlider

                android:id="@+id/volume"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_height="fill_parent"

                android:layout_weight="1"

                android:layout_marginRight="2dp"

                systemui:text="@string/status_bar_settings_mute_label"

                />

    </LinearLayout>

    <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -143,11 +151,12 @@ 
                style="@style/StatusBarPanelSettingsContents"

                android:text="@string/status_bar_settings_notifications"

                />

        <CheckBox

        <Switch

                android:id="@+id/do_not_disturb_checkbox"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginRight="5dp"

                />

    </LinearLayout>

    <View style="@style/StatusBarPanelSettingsPanelSeparator" />
@@ -172,7 +181,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:layout_marginTop="16dp"

            android:layout_marginRight="8dp"

            android:layout_marginRight="2dp"

            android:src="@drawable/ic_notification_open"

            />

    </LinearLayout>

packages/SystemUI/res/layout/status_bar_toggle_slider.xml

+12 −10
Original line number Diff line number Diff line
@@ -20,33 +20,35 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    >

    <ToggleButton

    <CheckBox

        android:id="@+id/toggle"

        android:layout_width="48dp"

        android:layout_height="wrap_content"

        android:layout_height="0dp"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_alignParentBottom="true"

        android:button="@drawable/status_bar_toggle_button"

        />

    <view

        class="com.android.systemui.statusbar.policy.ToggleSlider$Slider"

    <SeekBar

        android:id="@+id/slider"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/toggle"

        android:layout_alignParentTop="true"

        android:layout_centerVertical="true"

        android:layout_alignParentRight="true"

        android:paddingLeft="20dp"

        android:paddingRight="20dp"

        />

        <!--

    <TextView

        android:id="@+id/label"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_height="wrap_content"

        android:layout_alignLeft="@id/toggle"

        android:layout_alignRight="@id/toggle"

        android:layout_alignParentBottom="true"

        android:layout_below="@id/toggle"

        android:layout_centerVertical="true"

        android:gravity="center"

        android:paddingTop="26dp"

        android:textColor="#666666"

        android:textSize="12sp"

        />

        -->

</merge>

packages/SystemUI/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,5 +18,8 @@ 
    <declare-styleable name="KeyButtonView">

        <attr name="keyCode" format="integer" />

    </declare-styleable>

    <declare-styleable name="ToggleSlider">

        <attr name="text" format="string" />

    </declare-styleable>

</resources>