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

Commit 115f48a2 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Large-screen notification panel size + positioning." into jb-dev

parents 841a37aa 21b274e8

packages/SystemUI/res/values-sw600dp-port/config.xml→packages/SystemUI/res/layout-sw600dp/super_status_bar.xml

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

<!--

/*

** Copyright 2011, The Android Open Source Project

**

** Copyright 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.
@@ -17,9 +17,22 @@ 
*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <integer name="config_maxNotificationIcons">3</integer>

</resources>

<!-- This is the combined status bar / notification panel window. -->

<FrameLayout

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

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

    android:fitsSystemWindows="true"

    >



    <include layout="@layout/status_bar_expanded"

        android:layout_width="@dimen/notification_panel_width"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal|top"

        />



    <include layout="@layout/status_bar"

        android:layout_width="match_parent"

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

        />



</FrameLayout>

packages/SystemUI/res/layout/status_bar_expanded.xml

+99 −105
Original line number Diff line number Diff line
@@ -21,17 +21,13 @@ 
<FrameLayout 

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

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

    android:focusable="true"

    android:descendantFocusability="afterDescendants"

    >



    <FrameLayout

    android:id="@+id/notification_panel"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

        android:id="@+id/notification_panel"

    android:background="@drawable/notification_tracking_bg"

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

    android:layout_marginLeft="@dimen/notification_panel_margin_left"

    >



    <RelativeLayout
@@ -136,5 +132,3 @@ 
    </com.android.systemui.statusbar.phone.CloseDragHandle>



</FrameLayout><!-- end of sliding panel -->
 
 No newline at end of file
 


</FrameLayout><!-- end of window -->
 
 No newline at end of file

packages/SystemUI/res/values-large/colors.xml

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

<resources>

    <drawable name="status_bar_background">#000000</drawable>

    <drawable name="notification_icon_area_smoke">#aa000000</drawable>

</resources>

packages/SystemUI/res/values-large/config.xml

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

<!--

/*

** Copyright 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <!-- Whether or not we show the number in the bar. -->

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

</resources>

packages/SystemUI/res/values-large/dimens.xml

deleted100644 → 0
+0 −27
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.

*/

-->

<resources>

    <!-- The width of the ticker, including the icon -->

    <dimen name="notification_ticker_width">360dp</dimen>

    <!-- Status bar panel bottom offset (height of status bar - overlap) -->

    <dimen name="status_bar_panel_bottom_offset">36dp</dimen>

    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_padding">8dp</dimen>

</resources>