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

Commit f13cd857 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Removing unnecessary public values. (Bug 14995844)"

parents 94e4d29e 6784f1c6

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -1399,8 +1399,6 @@ package android { 
    field public static final int l_resource_pad9 = 17104904; // 0x1050008

    field public static final int notification_large_icon_height = 17104902; // 0x1050006

    field public static final int notification_large_icon_width = 17104901; // 0x1050005

    field public static final int recents_thumbnail_height = 17104913; // 0x1050011

    field public static final int recents_thumbnail_width = 17104914; // 0x1050012

    field public static final int thumbnail_height = 17104897; // 0x1050001

    field public static final int thumbnail_width = 17104898; // 0x1050002

  }

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -3010,8 +3010,8 @@ public final class ActivityThread { 
                int h;

                if (w < 0) {

                    Resources res = r.activity.getResources();

                    int wId = com.android.internal.R.dimen.recents_thumbnail_width;

                    int hId = com.android.internal.R.dimen.recents_thumbnail_height;

                    int wId = com.android.internal.R.dimen.thumbnail_width;

                    int hId = com.android.internal.R.dimen.thumbnail_height;

                    mThumbnailWidth = w = res.getDimensionPixelSize(wId);

                    mThumbnailHeight = h = res.getDimensionPixelSize(hId);

                } else {

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

+2 −6
Original line number Diff line number Diff line
@@ -19,13 +19,9 @@ 
-->

<resources>

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

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

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

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

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

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

    <dimen name="recents_thumbnail_width">512dp</dimen>

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

    <dimen name="recents_thumbnail_height">512dp</dimen>

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

    <!-- The maximum number of action buttons that should be permitted within

         an action bar/action mode. This will be used to determine how many

         showAsAction="ifRoom" items can fit. "always" items can override this. -->

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

+2 −6
Original line number Diff line number Diff line
@@ -35,13 +35,9 @@ 
    <item type="dimen" name="dialog_fixed_height_minor">90%</item>



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

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

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

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

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

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

    <dimen name="recents_thumbnail_width">512dp</dimen>

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

    <dimen name="recents_thumbnail_height">512dp</dimen>

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



    <!-- Preference activity, vertical padding for the header list -->

    <dimen name="preference_screen_header_vertical_padding">32dp</dimen>

core/res/res/values/dimens.xml

+2 −6
Original line number Diff line number Diff line
@@ -19,13 +19,9 @@ 
-->

<resources>

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

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

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

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

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

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

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

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

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

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

    <!-- The standard size (both width and height) of an application icon that

         will be displayed in the app launcher and elsewhere. -->

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