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

Commit cb120a9b authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Initial pass to update RecentApps panel to new UI specification."

parents 90d6b694 fefef311

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <dimen name="password_keyboard_key_height_numeric">0.47in</dimen>



    <!-- The width that is used when creating thumbnails of applications. -->

    <dimen name="thumbnail_width">256dp</dimen>

    <dimen name="thumbnail_width">160dp</dimen>

    <!-- The height that is used when creating thumbnails of applications. -->

    <dimen name="thumbnail_height">255dp</dimen>

    <dimen name="thumbnail_height">100dp</dimen>

</resources>

packages/SystemUI/res/drawable-xlarge-mdpi/app_icon.png

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

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

+17 −13
Original line number Diff line number Diff line
@@ -25,25 +25,29 @@ 
    android:background="@drawable/sysbar_panel_recents_bg"

    android:orientation="vertical">



    <TextView

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/recent_tasks_app_label"

        android:textSize="22dip"

        android:drawableLeft="@drawable/app_icon"

        android:layout_margin="10dip"

    />



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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:text="@string/recent_tasks_empty"

        android:textSize="22dip"

        android:gravity="center_horizontal|center_vertical"

        android:visibility="gone">

        android:visibility="gone"

        android:layout_margin="10dip">

    </TextView>



    <HorizontalScrollView android:id="@+id/scroll_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



    <LinearLayout android:id="@+id/recents_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            android:gravity="right"

            android:orientation="horizontal"

        android:orientation="vertical"

    />



    </HorizontalScrollView>



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

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

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

<!--

/* apps/common/assets/default/default/skins/StatusBar.xml

**

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

*/

-->



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

<LinearLayout

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

    android:layout_height="wrap_content"

    android:layout_width="wrap_content"

    android:orientation="horizontal"

    android:layout_margin="10dip">



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

        android:layout_width="88dip"

        android:layout_height="56dip"

        android:layout_margin="10dip"

        android:background="#80808080">

    </ImageView>



    <LinearLayout

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:orientation="horizontal"

        android:layout_marginTop="10dip"

        android:layout_marginBottom="10dip"

        android:layout_marginRight="10dip">



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

            android:layout_width="23dip"

            android:layout_height="23dip"

            android:gravity="bottom"

            android:layout_margin="5dip"

            />



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="22dip"

        />



    </LinearLayout>



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 
    <!-- Recent Tasks dialog: message when there are no recent applications [CHAR LIMIT=NONE]-->

    <string name="recent_tasks_empty">No recent applications.</string>



    <!-- Recent apps label. Shown as title on recent apps panel -->

    <string name="recent_tasks_app_label">Apps</string>



    <!-- Rotation lock toast text: shown when rotation lock is turned off (and the screen will

         auto-rotate based on the accelerometer).  [CHAR LIMIT=NONE]-->

    <string name="toast_rotation_free">Screen will rotate automatically.</string>