Skip to content

Commit f6a3412

Browse files
committed
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
1 parent bec1d13 commit f6a3412

File tree

9 files changed

+20
-84
lines changed

9 files changed

+20
-84
lines changed

packages/SystemUI/res/layout-port/status_bar_recent_item.xml renamed to packages/SystemUI/res/layout/status_bar_recent_item.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length"
3939
android:scrollHorizontally="true"
4040
android:layout_alignParentLeft="true"
41-
android:layout_alignTop="@id/app_icon"
41+
android:layout_alignTop="@+id/app_icon"
4242
android:paddingTop="2dp"
4343
android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
4444
android:singleLine="true"
@@ -71,7 +71,7 @@
7171
android:background="@drawable/recents_callout_line"
7272
/>
7373

74-
<ImageView android:id="@+id/app_icon"
74+
<ImageView android:id="@id/app_icon"
7575
android:layout_width="wrap_content"
7676
android:layout_height="wrap_content"
7777
android:layout_toRightOf="@id/app_label"

packages/SystemUI/res/layout-port/status_bar_recent_panel.xml renamed to packages/SystemUI/res/layout/status_bar_recent_panel.xml

File renamed without changes.

packages/SystemUI/res/layout-port/status_bar_search_panel.xml renamed to packages/SystemUI/res/layout/status_bar_search_panel.xml

File renamed without changes.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.
File renamed without changes.

packages/SystemUI/res/values/config.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,9 @@
6868

6969
<!-- The length of the vibration when the notificaiotn pops open. -->
7070
<integer name="one_finger_pop_duration_ms">10</integer>
71+
72+
<!-- Whether we're using the tablet-optimized recents interface (we use this
73+
value at runtime for some things) -->
74+
<integer name="status_bar_recents_bg_gradient_degrees">90</integer>
7175
</resources>
7276

packages/SystemUI/res/values/dimens.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,20 @@
3939
<dimen name="status_bar_recents_scroll_fading_edge_length">10dip</dimen>
4040
<!-- Margin between recents container and glow on the right -->
4141
<dimen name="status_bar_recents_right_glow_margin">100dip</dimen>
42+
<!-- How far the thumbnail for a recent app appears from left edge -->
43+
<dimen name="status_bar_recents_thumbnail_left_margin">20dp</dimen>
44+
<!-- Padding for text descriptions -->
45+
<dimen name="status_bar_recents_text_description_padding">8dp</dimen>
46+
<!-- Width of application label text -->
47+
<dimen name="status_bar_recents_app_label_width">88dip</dimen>
48+
<!-- Left margin of application label text -->
49+
<dimen name="status_bar_recents_app_label_left_margin">0dip</dimen>
50+
<!-- Padding between recents items -->
51+
<dimen name="status_bar_recents_item_padding">0dip</dimen>
52+
<!-- Where to place the app icon over the thumbnail -->
53+
<dimen name="status_bar_recents_app_icon_left_margin">0dp</dimen>
54+
<dimen name="status_bar_recents_app_icon_top_margin">8dp</dimen>
55+
4256
<!-- Amount to offset bottom of notification peek window from top of status bar. -->
4357
<dimen name="peek_window_y_offset">-12dp</dimen>
4458

0 commit comments

Comments
 (0)