diff options
| -rw-r--r-- | core/res/res/values/config.xml | 11 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/WindowOrientationListener.java | 18 |
3 files changed, 3 insertions, 27 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 61da1e4977a6..762638d3aa90 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -651,17 +651,6 @@ <!-- rotation: 270 (rotate CW) --> <item>-25</item> <item>65</item> </integer-array> - <!-- Indicate the name of the window orientation sensor type if present. A - window orientation sensor produces values to be used in lieu of the - typical, accelerometer based sensor. It must only produce integral - values between 0 and 3, inclusive, with each one corresponding to a - given rotation: - 0: 0 degrees of rotation (natural) - 1: 90 degrees of rotation (rotate CCW) - 2: 180 degrees of rotation (reverse) - 3: 270 degrees of rotation (rotate CW) --> - <string name="config_orientationSensorType" translatable="false">@null</string> - <!-- Lid switch behavior --> <!-- The number of degrees to rotate the display when the keyboard is open. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 32510397c56a..8df51dffe7df 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1586,7 +1586,6 @@ <java-symbol type="string" name="bugreport_option_interactive_title" /> <java-symbol type="string" name="bugreport_status" /> <java-symbol type="string" name="bugreport_title" /> - <java-symbol type="string" name="config_orientationSensorType" /> <java-symbol type="string" name="faceunlock_multiple_failures" /> <java-symbol type="string" name="global_action_power_off" /> <java-symbol type="string" name="global_actions_airplane_mode_off_status" /> diff --git a/services/core/java/com/android/server/policy/WindowOrientationListener.java b/services/core/java/com/android/server/policy/WindowOrientationListener.java index 991622398a48..a32c017c4297 100644 --- a/services/core/java/com/android/server/policy/WindowOrientationListener.java +++ b/services/core/java/com/android/server/policy/WindowOrientationListener.java @@ -87,22 +87,10 @@ public abstract class WindowOrientationListener { mHandler = handler; mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); mRate = rate; + mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_DEVICE_ORIENTATION); - mSensorType = context.getResources().getString( - com.android.internal.R.string.config_orientationSensorType); - if (!TextUtils.isEmpty(mSensorType)) { - List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL); - final int N = sensors.size(); - for (int i = 0; i < N; i++) { - Sensor sensor = sensors.get(i); - if (mSensorType.equals(sensor.getStringType())) { - mSensor = sensor; - break; - } - } - if (mSensor != null) { - mOrientationJudge = new OrientationSensorJudge(); - } + if (mSensor != null) { + mOrientationJudge = new OrientationSensorJudge(); } if (mOrientationJudge == null) { |