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

Commit f6a34124 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Move lots of layout-port/ resources to layout/ . 

The framework is no longer letting us skate by without a
default (unqualified) for of each resource; in particular,
the land/port aspect of the configuration appears to be
binding much later than it used to.

Bug: 6937365
Change-Id: I6bf72c76e707548168fefa9466dc196ffde33ab3
parent bec1d13d

packages/SystemUI/res/layout-port/status_bar_recent_item.xml→packages/SystemUI/res/layout/status_bar_recent_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
            android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length"

            android:scrollHorizontally="true"

            android:layout_alignParentLeft="true"

            android:layout_alignTop="@id/app_icon"

            android:layout_alignTop="@+id/app_icon"

            android:paddingTop="2dp"

            android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"

            android:singleLine="true"
@@ -71,7 +71,7 @@ 
            android:background="@drawable/recents_callout_line"

        />



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

        <ImageView android:id="@id/app_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/app_label"

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

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

<!--

/*

** Copyright 2011, 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 we're using the tablet-optimized recents interface (we use this

     value at runtime for some things) -->

    <integer name="status_bar_recents_bg_gradient_degrees">90</integer>

</resources>

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

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

    <!-- Recent Applications parameters -->

    <!-- How far the thumbnail for a recent app appears from left edge -->

    <dimen name="status_bar_recents_thumbnail_left_margin">20dp</dimen>

    <!-- Padding for text descriptions -->

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

    <!-- Width of application label text -->

    <dimen name="status_bar_recents_app_label_width">88dip</dimen>

    <!-- Left margin of application label text -->

    <dimen name="status_bar_recents_app_label_left_margin">0dip</dimen>

    <!-- Margin between recents container and glow on the right -->

    <dimen name="status_bar_recents_right_glow_margin">100dip</dimen>

    <!-- Padding between recents items -->

    <dimen name="status_bar_recents_item_padding">0dip</dimen>

    <!-- Where to place the app icon over the thumbnail -->

    <dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen>

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

</resources>