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

Commit 1aec006b authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 21f492b7: am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev 

* commit '21f492b7':
  Rebuild quick settings tile layouts.
parents 1f65c79d 21f492b7

packages/SystemUI/res/layout/quick_settings_tile_alarm.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

-->

<TextView

<TextView

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

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

    style="@style/TextAppearance.QuickSettings.TileView"

    style="@style/TextAppearance.QuickSettings.TileView.AllInOne"

    android:id="@+id/alarm_textview"

    android:id="@+id/alarm_textview"

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

packages/SystemUI/res/layout/quick_settings_tile_airplane.xml→packages/SystemUI/res/layout/quick_settings_tile_basic.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<!-- Copyright (C) 2013 The Android Open Source Project





     Licensed under the Apache License, Version 2.0 (the "License");

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     you may not use this file except in compliance with the License.
@@ -13,12 +13,27 @@ 
     See the License for the specific language governing permissions and

     See the License for the specific language governing permissions and

     limitations under the License.

     limitations under the License.

-->

-->

<TextView

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="top"

    android:orientation="vertical">

    <ImageView

        android:id="@+id/image"

        android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

        android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

        android:layout_width="@dimen/qs_tile_icon_size"

        android:layout_height="@dimen/qs_tile_icon_size"

        android:layout_gravity="top|center_horizontal"

        android:scaleType="centerInside"

        />

    <TextView

        style="@style/TextAppearance.QuickSettings.TileView"

        style="@style/TextAppearance.QuickSettings.TileView"

    android:id="@+id/airplane_mode_textview"

        android:id="@+id/text"

    android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

    android:layout_gravity="center"

        android:layout_gravity="top|center_horizontal"

    android:gravity="center"

        android:gravity="top|center_horizontal"

        />

        />

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings_tile_battery.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project

<!-- Copyright (C) 2013 The Android Open Source Project





     Licensed under the Apache License, Version 2.0 (the "License");

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     you may not use this file except in compliance with the License.
@@ -15,23 +15,25 @@ 
-->

-->

<LinearLayout

<LinearLayout

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

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

    android:layout_width="wrap_content"

        android:layout_width="match_parent"

    android:layout_height="wrap_content"

        android:layout_height="match_parent"

    android:layout_gravity="center"

        android:layout_gravity="top"

        android:orientation="vertical">

        android:orientation="vertical">

    <ImageView

    <ImageView

        android:id="@+id/battery_image"

            android:id="@+id/image"

        android:layout_width="wrap_content"

            android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

        android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

        android:layout_gravity="center"

            android:layout_width="@dimen/qs_tile_icon_size"

        android:paddingBottom="10dp"

            android:layout_height="@dimen/qs_tile_icon_size"

            android:layout_gravity="top|center_horizontal"

            android:scaleType="centerInside"

            />

            />

    <TextView

    <TextView

            style="@style/TextAppearance.QuickSettings.TileView"

            style="@style/TextAppearance.QuickSettings.TileView"

        android:id="@+id/battery_textview"

            android:id="@+id/text"

        android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

        android:layout_gravity="center"

            android:layout_gravity="top|center_horizontal"

        android:gravity="center"

            android:gravity="top|center_horizontal"

            />

            />

</LinearLayout>
 
</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings_tile_bluetooth.xml

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

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

-->

<TextView

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

    style="@style/TextAppearance.QuickSettings.TileView"

    android:id="@+id/bluetooth_textview"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:gravity="center"

    />
 
 No newline at end of file

packages/SystemUI/res/layout/quick_settings_tile_brightness.xml

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

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

-->

<TextView

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

    style="@style/TextAppearance.QuickSettings.TileView"

    android:id="@+id/brightness_textview"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:gravity="center"

    android:drawableTop="@drawable/ic_qs_brightness_auto_off"

    />
 
 No newline at end of file