Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2014-05-22 19:20:14 +00:00
committed by Android (Google) Code Review
parent 94e4d29eff 6784f1c623
commit f13cd857e0
7 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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
}

4
core/java/android/app/ActivityThread.java
View File

@@ -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 {

8
core/res/res/values-sw600dp/dimens.xml
View File

@@ -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. -->

8
core/res/res/values-sw720dp/dimens.xml
View File

@@ -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>

8
core/res/res/values/dimens.xml
View File

@@ -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>

3
core/res/res/values/public.xml
View File

@@ -2181,9 +2181,6 @@
<public-padding type="dimen" name="l_resource_pad" end="0x01050010" />
<public type="dimen" name="recents_thumbnail_height" />
<public type="dimen" name="recents_thumbnail_width" />
<public-padding type="id" name="l_resource_pad" end="0x01020040" />
<public type="id" name="mask" />

6
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -345,10 +345,8 @@ final class ActivityStack {
mCurrentUser = mService.mCurrentUserId;
// Get the activity screenshot thumbnail dimensions
Resources res = mService.mContext.getResources();
mThumbnailWidth =
res.getDimensionPixelSize(com.android.internal.R.dimen.recents_thumbnail_width);
mThumbnailHeight =
res.getDimensionPixelSize(com.android.internal.R.dimen.recents_thumbnail_height);
mThumbnailWidth = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_width);
mThumbnailHeight = res.getDimensionPixelSize(com.android.internal.R.dimen.thumbnail_height);
}
/**