drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move emulator check & save system properties access" into klp-modular-dev

Browse Source
This commit is contained in:
Michael Kolb
2014-06-20 23:15:59 +00:00
committed by Android (Google) Code Review
parent 90c9fffc95 22dfdcb7ee
commit 270c099faf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRootImpl.java
View File

@ -121,7 +121,7 @@ public final class ViewRootImpl implements ViewParent,
private static final String PROPERTY_MEDIA_DISABLED = "config.disable_media"; private static final String PROPERTY_MEDIA_DISABLED = "config.disable_media";
// property used by emulator to determine display shape // property used by emulator to determine display shape
private static final String PROPERTY_DISPLAY_CIRCULAR = "ro.emulator.circular"; private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.emulator.circular";
/** /**
* Maximum time we allow the user to roll the trackball enough to generate * Maximum time we allow the user to roll the trackball enough to generate
@ -326,6 +326,8 @@ public final class ViewRootImpl implements ViewParent,
/** Set to true once doDie() has been called. */ /** Set to true once doDie() has been called. */
private boolean mRemoved; private boolean mRemoved;
private boolean mIsEmulator;
/** /**
* Consistency verifier for debugging purposes. * Consistency verifier for debugging purposes.
*/ */
@ -1161,8 +1163,7 @@ public final class ViewRootImpl implements ViewParent,
if ((mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN) != 0 if ((mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN) != 0
&& mDisplay.getDisplayId() == 0) { && mDisplay.getDisplayId() == 0) {
// we're fullscreen and not hosted in an ActivityView // we're fullscreen and not hosted in an ActivityView
isRound = (Build.HARDWARE.contains("goldfish") isRound = (mIsEmulator && SystemProperties.getBoolean(PROPERTY_EMULATOR_CIRCULAR, false))
&& SystemProperties.getBoolean(PROPERTY_DISPLAY_CIRCULAR, false))
|| mContext.getResources().getBoolean( || mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowIsRound); com.android.internal.R.bool.config_windowIsRound);
} }
@ -5384,6 +5385,9 @@ public final class ViewRootImpl implements ViewParent,
mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_WORLD, 200); mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_WORLD, 200);
} }
} }
// detect emulator
mIsEmulator = Build.HARDWARE.contains("goldfish");
} }
}); });
} }