diff --git a/packages/apps/Settings/src/com/android/settings/display/ScreenScaleActivity.java b/packages/apps/Settings/src/com/android/settings/display/ScreenScaleActivity.java index d21f5be3a9f..cc765a206db 100644 --- a/packages/apps/Settings/src/com/android/settings/display/ScreenScaleActivity.java +++ b/packages/apps/Settings/src/com/android/settings/display/ScreenScaleActivity.java @@ -16,25 +16,26 @@ package com.android.settings.display; -import android.graphics.Rect; -import android.os.Handler; import android.annotation.TargetApi; import android.app.Activity; +import android.content.pm.ActivityInfo; +import android.graphics.BitmapFactory; +import android.graphics.Bitmap; +import android.graphics.Rect; +import android.graphics.PixelFormat; +import android.os.Build; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.text.TextUtils; +import android.util.DisplayMetrics; +import android.util.Log; import android.view.KeyEvent; +import android.view.View; import android.view.WindowManager; -import android.os.Build; -import android.os.Message; import android.widget.ImageView; -import android.view.View; -import android.graphics.PixelFormat; -import android.graphics.BitmapFactory; -import android.graphics.Bitmap; import android.widget.RelativeLayout; import android.widget.Toast; -import android.text.TextUtils; -import android.util.DisplayMetrics; -import android.util.Log; import com.android.settings.R; import com.android.settings.utils.ReflectUtils; @@ -65,6 +66,7 @@ public class ScreenScaleActivity extends Activity { public static final String EXTRA_DISPLAY_INFO = "extra_display_info"; public static final String EXTRA_DISPLAY = "extra_display"; + private int mOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; private int mScreenWidth = 0; private int mScreenHeight = 0; private int mDensityDpi = 0; @@ -211,6 +213,10 @@ public class ScreenScaleActivity extends Activity { initData(); //full screen //hideSystemUI(); + + mOrientation = getRequestedOrientation(); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + setContentView(R.layout.screen_scale_setting); //getWindow().setFormat(PixelFormat.RGBA_8888); // BitmapFactory.setDefaultConfig(Bitmap.Config.ARGB_8888); @@ -218,6 +224,11 @@ public class ScreenScaleActivity extends Activity { createView(); } + public void onDestroy() { + super.onDestroy(); + setRequestedOrientation(mOrientation); + } + private View.OnClickListener mOnClick = new View.OnClickListener() { public void onClick(View v) { int id = v.getId();