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

am 71f65485: am db9fed74: Merge "Make WindowInsets.isRound work with emulator" into klp-modular-dev

Browse Source 
* commit '71f65485bf47c8bfbae2b3a0a9573b311668b4a2':
  Make WindowInsets.isRound work with emulator
This commit is contained in:
Michael Kolb
2014-06-21 20:24:28 +00:00
committed by Android Git Automerger
parent 4bae7d39ff 71f65485bf
commit c0fcf109f0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import android.hardware.display.DisplayManager;
import android.hardware.display.DisplayManager.DisplayListener;
import android.media.AudioManager;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
import android.os.Handler;
@ -119,6 +120,9 @@ public final class ViewRootImpl implements ViewParent,
private static final String PROPERTY_PROFILE_RENDERING = "viewroot.profile_rendering";
private static final String PROPERTY_MEDIA_DISABLED = "config.disable_media";
// property used by emulator to determine display shape
private static final String PROPERTY_DISPLAY_CIRCULAR = "ro.emulator.circular";
/**
* Maximum time we allow the user to roll the trackball enough to generate
* a key event, before resetting the counters.
@ -1170,8 +1174,10 @@ public final class ViewRootImpl implements ViewParent,
if ((mWindowAttributes.flags & WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN) != 0
&& mDisplay.getDisplayId() == 0) {
// we're fullscreen and not hosted in an ActivityView
isRound = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowIsRound);
isRound = (Build.HARDWARE.contains("goldfish")
&& SystemProperties.getBoolean(PROPERTY_DISPLAY_CIRCULAR, false))
|| mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowIsRound);
}
host.dispatchApplyWindowInsets(new WindowInsets(
mFitSystemWindowsInsets, isRound));