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

Merge "Make adb shell am display-size persistent." into honeycomb-mr2

Browse Source
This commit is contained in:
Joe Onorato
2011-05-25 11:40:59 -07:00
committed by Android (Google) Code Review
parent 2a15eb559c 571ae90801
commit 5520610cb2
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@ -2544,6 +2544,13 @@ public final class Settings {
public static final String LOCK_SCREEN_OWNER_INFO_ENABLED =
"lock_screen_owner_info_enabled";
/**
* The saved value for WindowManagerService.setForcedDisplaySize().
* Two integers separated by a comma. If unset, then use the real display size.
* @hide
*/
public static final String DISPLAY_SIZE_FORCED = "display_size_forced";
/**
* Whether assisted GPS should be enabled or not.
* @hide

32
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -5996,8 +5996,12 @@ public class WindowManagerService extends IWindowManager.Stub
mActivityManager.updateConfiguration(null);
} catch (RemoteException e) {
}
mPolicy.systemReady();
synchronized (mWindowMap) {
readForcedDisplaySizeLocked();
}
}
// This is an animation that does nothing: it just immediately finishes
@ -6513,6 +6517,8 @@ public class WindowManagerService extends IWindowManager.Stub
? shortDimen : mInitialDisplayHeight;
}
setForcedDisplaySizeLocked(width, height);
Settings.Secure.putString(mContext.getContentResolver(),
Settings.Secure.DISPLAY_SIZE_FORCED, width + "," + height);
}
}
@ -6559,7 +6565,29 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
private void readForcedDisplaySizeLocked() {
final String str = Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.DISPLAY_SIZE_FORCED);
if (str == null || str.length() == 0) {
return;
}
final int pos = str.indexOf(',');
if (pos <= 0 || str.lastIndexOf(',') != pos) {
return;
}
int width, height;
try {
width = Integer.parseInt(str.substring(0, pos));
height = Integer.parseInt(str.substring(pos+1));
} catch (NumberFormatException ex) {
return;
}
setForcedDisplaySizeLocked(width, height);
}
private void setForcedDisplaySizeLocked(int width, int height) {
Slog.i(TAG, "Using new display size: " + width + "x" + height);
mBaseDisplayWidth = width;
mBaseDisplayHeight = height;
mPolicy.setInitialDisplaySize(mBaseDisplayWidth, mBaseDisplayHeight);
@ -6589,6 +6617,8 @@ public class WindowManagerService extends IWindowManager.Stub
public void clearForcedDisplaySize() {
synchronized(mWindowMap) {
setForcedDisplaySizeLocked(mInitialDisplayWidth, mInitialDisplayHeight);
Settings.Secure.putString(mContext.getContentResolver(),
Settings.Secure.DISPLAY_SIZE_FORCED, "");
}
}