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

Commit 0ad460b0 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Look again; the system bar is now diamonds. 

Lights Out 3.0 (bug 3241144)
  - new artwork
  - new transition animations
  - new interaction (tap anywhere to dismiss & interact)
  - much simpler overall design and implementation

Layout (bug 3242949)
  - fine-tuned spacing on navigation and notification icons
  - notification icon spacing compresses in portrait

Shirt Pocket (bug 3203179)
  - disabled for now

Bug: 3241144
Bug: 3242949
Bug: 3203179
Change-Id: I6e9b7f9ebe07317d07609f11d5f03f22269bc7bb
parent b146b121

core/res/res/values-xlarge/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
*/

-->

<resources>

    <dimen name="status_bar_height">48dip</dimen>

    <!-- Height of the status bar -->

    <dimen name="status_bar_icon_size">48dip</dimen>

    <dimen name="status_bar_height">48dip</dimen>

    <!-- Width and height of a single notification icon in the status bar -->

    <dimen name="status_bar_icon_size">32dip</dimen>

    <!-- Size of the giant number (unread count) in the notifications -->

    <dimen name="status_bar_content_number_size">48sp</dimen>

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

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

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

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

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

+76 −217
Original line number Diff line number Diff line
@@ -15,12 +15,18 @@ 
 * limitations under the License.

-->



<!--    android:background="@drawable/status_bar_closed_default_background" -->

<!-- TabletStatusBarView extends FrameLayout -->

<com.android.systemui.statusbar.tablet.TabletStatusBarView

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

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

    android:background="@drawable/status_bar_background"

    >

    

    <FrameLayout

        android:id="@+id/bar_contents_holder"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        >

        <RelativeLayout

            android:id="@+id/bar_contents"

            android:layout_width="match_parent"
@@ -28,113 +34,11 @@ 
            >



            <!-- notification icons & panel access -->

        <LinearLayout

            android:id="@+id/notificationArea"

            <include layout="@layout/status_bar_notification_area" 

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_alignParentRight="true"

            android:orientation="horizontal"

            >

            <com.android.systemui.statusbar.tablet.InputMethodButton

                android:id="@+id/imeSwitchButton"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginLeft="8dip"

                android:src="@drawable/ic_sysbar_ime_default"

                android:visibility="gone"

                />

            <com.android.systemui.statusbar.tablet.NotificationIconArea

                android:id="@+id/notificationIcons"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:orientation="horizontal"

                >

                <view

                    class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"

                    android:id="@+id/icons"

                    android:layout_width="wrap_content"

                    android:layout_height="@*android:dimen/status_bar_icon_size"

                    android:layout_gravity="top"

                    android:layout_marginTop="5dp"

                    android:layout_marginLeft="8dp"

                    />

            </com.android.systemui.statusbar.tablet.NotificationIconArea>



            <LinearLayout

                android:id="@+id/notificationTrigger"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                >

                <com.android.systemui.statusbar.tablet.HoloClock

                    android:id="@+id/clock"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    >

                    <TextView android:id="@+id/time_bg"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:singleLine="true"

                        android:textSize="72dip"

                        android:textColor="#1f1f1f" />

                    <TextView android:id="@+id/time_fg"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:singleLine="true"

                        android:textSize="72dip"

                        android:textColor="#2e2e2e" />

                </com.android.systemui.statusbar.tablet.HoloClock>



                <TextView

                    android:id="@+id/network_text"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:layout_marginTop="12dp"

                    android:layout_marginRight="6dip"

                    android:layout_marginLeft="6dip"

                    android:gravity="center"

                    android:singleLine="true"

                    android:visibility="gone"

                    android:textSize="14dip"

                    android:textColor="#606060"

                    />



                <LinearLayout

                    android:id="@+id/signal_battery_cluster"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:orientation="horizontal"

                    android:gravity="center"

                    >

                    <FrameLayout

                        android:layout_height="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_gravity="top"

                        android:layout_marginTop="19dp"

                        android:layout_marginRight="4dp"

                        >

                        <ImageView

                            android:id="@+id/network_signal"

                            android:layout_height="wrap_content"

                            android:layout_width="wrap_content"

                            />

                        <ImageView

                            android:id="@+id/network_type"

                            android:layout_height="wrap_content"

                            android:layout_width="wrap_content"

                            />

                    </FrameLayout>

                    <ImageView

                        android:id="@+id/battery"

                        android:layout_height="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_gravity="top"

                        android:layout_marginTop="19dp"

                        android:layout_marginLeft="2dp"

                        android:layout_marginRight="2dp"

                        />

                </LinearLayout>

            </LinearLayout>

        </LinearLayout>



            <!-- navigation controls -->

            <LinearLayout
@@ -146,135 +50,90 @@ 
                >



                <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"

                android:layout_width="96dip"

                    android:layout_width="80dip"

                    android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                    android:src="@drawable/ic_sysbar_back"

                    systemui:keyCode="4"

                    />

                <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"

                android:layout_width="96dip"

                    android:layout_width="80dip"

                    android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                    android:src="@drawable/ic_sysbar_home"

                    systemui:keyCode="3"

                    />

            <ImageButton android:id="@+id/recent_apps"

                android:layout_width="96dip"

                <ImageView android:id="@+id/recent_apps"

                    android:layout_width="80dip"

                    android:layout_height="match_parent"

                    android:src="@drawable/ic_sysbar_recent"

                android:background="@null"

                android:paddingLeft="18dip"

                android:clickable="true"

                android:paddingRight="18dip"

                    />

                <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"

                android:layout_width="96dip"

                    android:layout_width="80dip"

                    android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                    android:src="@drawable/ic_sysbar_menu"

                    systemui:keyCode="82"

                    android:visibility="invisible"

                    />

            <com.android.systemui.statusbar.tablet.ShirtPocket

                android:id="@+id/pocket"

                android:layout_width="wrap_content"

            </LinearLayout>



            <!-- fake space bar zone -->

            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/fake_space_bar"

                android:layout_height="match_parent"

                android:animateLayoutChanges="true"

                android:clickable="true"

                android:descendantFocusability="blocksDescendants"

                android:gravity="center"

                >

                <ImageView 

                    android:id="@+id/pocket_icon"

                    android:src="@drawable/ic_sysbar_pocket"

                    android:paddingLeft="18dip"

                    android:paddingRight="18dip"

                    android:layout_width="96dip"

                    android:layout_height="wrap_content"

                    android:gravity="center"

                android:layout_width="match_parent"

                android:paddingLeft="8dip"

                android:paddingRight="8dip"

                android:layout_toRightOf="@+id/navigationArea"

                android:layout_toLeftOf="@+id/notificationArea"

                android:visibility="gone"

                systemui:keyCode="62"

                />

            </com.android.systemui.statusbar.tablet.ShirtPocket>

        </LinearLayout>

        </RelativeLayout>

    </FrameLayout>



        <!-- lights out mode: "shadow" views -->

        <RelativeLayout

            android:id="@+id/shadows"

    <FrameLayout

        android:id="@+id/bar_shadow_holder"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        >

            <ImageView

                android:id="@+id/notification_shadow"

                android:layout_width="176dip"

        <!-- lights out shade -->

        <RelativeLayout

            android:id="@+id/bar_shadow"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

                android:paddingRight="48dip"

                android:layout_alignParentRight="true"

                android:layout_alignParentBottom="true"

                android:src="@drawable/ic_sysbar_shadow"

            android:background="#FF000000"

            android:visibility="gone"

                android:scaleType="fitXY"

                />



            >

            <ImageView

                android:id="@+id/back_shadow"

                android:layout_width="96dip"

                android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                android:id="@+id/dot0"

                android:layout_width="80dip"

                android:layout_height="48dip"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:layout_alignParentLeft="true"

                android:layout_alignParentBottom="true"

                android:src="@drawable/ic_sysbar_shadow"

                android:visibility="gone"

                />

            <ImageView

                android:id="@+id/home_shadow"

                android:layout_width="96dip"

                android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                android:layout_toRightOf="@id/back_shadow"

                android:id="@+id/dot1"

                android:layout_width="80dip"

                android:layout_height="48dip"

                android:src="@drawable/ic_sysbar_lights_out_dot_large"

                android:layout_toRightOf="@+id/dot0"

                android:layout_alignParentBottom="true"

                android:src="@drawable/ic_sysbar_shadow"

                android:visibility="gone"

                />

            <ImageView

                android:id="@+id/recent_shadow"

                android:layout_width="96dip"

                android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                android:layout_toRightOf="@id/home_shadow"

                android:id="@+id/dot2"

                android:layout_width="80dip"

                android:layout_height="48dip"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:layout_toRightOf="@+id/dot1"

                android:layout_alignParentBottom="true"

                android:src="@drawable/ic_sysbar_shadow"

                android:visibility="gone"

                />

            <ImageView

                android:id="@+id/menu_shadow"

                android:layout_width="96dip"

                android:layout_height="match_parent"

                android:paddingLeft="18dip"

                android:paddingRight="18dip"

                android:layout_toRightOf="@id/recent_shadow"

                android:id="@+id/dot3"

                android:layout_width="80dip"

                android:layout_height="48dip"

                android:src="@drawable/ic_sysbar_lights_out_dot_small"

                android:layout_alignParentRight="true"

                android:layout_alignParentBottom="true"

                android:src="@drawable/ic_sysbar_shadow"

                android:visibility="gone"

                />

        </RelativeLayout>



        <!-- fake space bar zone -->

        <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/fake_space_bar"

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            android:paddingLeft="8dip"

            android:paddingRight="8dip"

            android:layout_toRightOf="@+id/navigationArea"

            android:layout_toLeftOf="@+id/notificationArea"

            android:visibility="gone"

            systemui:keyCode="62"

                />

        </RelativeLayout>

    </FrameLayout>

</com.android.systemui.statusbar.tablet.TabletStatusBarView>

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

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

-->



<!-- notification icons & panel access -->

<LinearLayout

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

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

    android:id="@+id/notificationArea"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_alignParentRight="true"

    android:orientation="horizontal"

    >

    <com.android.systemui.statusbar.tablet.InputMethodButton

        android:id="@+id/imeSwitchButton"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_marginLeft="8dip"

        android:src="@drawable/ic_sysbar_ime_default"

        android:visibility="gone"

        />

    <com.android.systemui.statusbar.tablet.NotificationIconArea

        android:id="@+id/notificationIcons"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        >

        <view

            class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"

            android:id="@+id/icons"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="center_vertical"

            android:paddingTop="5dp"

            android:layout_marginLeft="8dp"

            />

    </com.android.systemui.statusbar.tablet.NotificationIconArea>



    <LinearLayout

        android:id="@+id/notificationTrigger"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        >

        <com.android.systemui.statusbar.tablet.HoloClock

            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            >

            <TextView android:id="@+id/time_bg"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:textSize="72dip"

                android:textColor="#1f1f1f" />

            <TextView android:id="@+id/time_fg"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:textSize="72dip"

                android:textColor="#2e2e2e" />

        </com.android.systemui.statusbar.tablet.HoloClock>



        <TextView

            android:id="@+id/network_text"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginTop="12dp"

            android:layout_marginRight="6dip"

            android:layout_marginLeft="6dip"

            android:gravity="center"

            android:singleLine="true"

            android:visibility="gone"

            android:textSize="14dip"

            android:textColor="#606060"

            />



        <LinearLayout

            android:id="@+id/signal_battery_cluster"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:gravity="center"

            >

            <FrameLayout

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="top"

                android:layout_marginTop="19dp"

                android:layout_marginRight="4dp"

                >

                <ImageView

                    android:id="@+id/network_signal"

                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    />

                <ImageView

                    android:id="@+id/network_type"

                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    />

            </FrameLayout>

            <ImageView

                android:id="@+id/battery"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_gravity="top"

                android:layout_marginTop="19dp"

                android:layout_marginLeft="2dp"

                android:layout_marginRight="2dp"

                />

        </LinearLayout>

    </LinearLayout>

</LinearLayout>