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

Commit cb49aba2 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am e8910d3b: am 3ed6f945: Showing QuickContacts card, adding brightness bar... 

am e8910d3b: am 3ed6f945: Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)

* commit 'e8910d3b':
  Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
parents b06fc580 e8910d3b

packages/SystemUI/res/layout/quick_settings.xml

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
          android:id="@+id/quick_settings_container"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:paddingBottom="@dimen/quick_settings_container_padding"

          android:paddingLeft="@dimen/quick_settings_container_padding"

          android:paddingRight="@dimen/quick_settings_container_padding"

          android:animateLayoutChanges="true"

          android:columnCount="@integer/quick_settings_num_columns"

          />

packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml

+2 −5
Original line number Diff line number Diff line
@@ -17,16 +17,13 @@ 
<LinearLayout 

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

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:padding="16dp">

    style="@style/BrightnessDialogContainer">



    <ImageView

        android:id="@+id/brightness_icon"

        style="@style/SystemBarPanelSettingsIcon"

        android:layout_gravity="center_vertical"

        android:paddingRight="10dp"

        android:src="@drawable/ic_sysbar_brightness"

        android:src="@drawable/ic_qs_brightness_auto_off"

        />

    <com.android.systemui.statusbar.policy.ToggleSlider

        android:id="@+id/brightness_slider"

packages/SystemUI/res/values-land/styles.xml

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

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

-->



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

    <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer">

        <item name="android:layout_width">360dp</item>

    </style>

</resources>

packages/SystemUI/res/values-sw600dp/styles.xml

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

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

-->



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

    <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer">

        <item name="android:layout_width">560dp</item>

    </style>

</resources>

packages/SystemUI/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -90,5 +90,9 @@ 


    <!-- Whether rotation lock shows up in quick settings or not -->

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



    <!-- Timeouts for brightness dialog to disappear -->

    <integer name="quick_settings_brightness_dialog_short_timeout">2000</integer>

    <integer name="quick_settings_brightness_dialog_long_timeout">4000</integer>

</resources>