summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker
diff options
context:
space:
mode:
authorRahul Chaturvedi <rkc@google.com>2015-05-20 01:02:16 (GMT)
committerRahul Chaturvedi <rkc@google.com>2015-06-01 20:50:50 (GMT)
commit7fc77cad3d06bd3647e550f7419e89116471240a (patch)
treee68308cd9e09774335e3339534e885edd0db124c /WallpaperPicker
parentcadc29c7e55cc14526878e511a85ae6c9c7e23c7 (diff)
downloadandroid_packages_apps_Trebuchet-7fc77cad3d06bd3647e550f7419e89116471240a.zip
android_packages_apps_Trebuchet-7fc77cad3d06bd3647e550f7419e89116471240a.tar.gz
android_packages_apps_Trebuchet-7fc77cad3d06bd3647e550f7419e89116471240a.tar.bz2
Add the Allow Rotation setting to Launcher3.
This CL adds a Settings activity along with the code needed to provide a "Allow Rotation" setting to all phones and tablets. This setting is set to false for phones and true for tablets. On changing the setting from unlocked to locked, the launcher (and the Settings activity) will get locked to the orientation the user was in when he disabled "Allow Rotation". This is consistent with how the natural rotation feature of Android works. Change-Id: I8a1c59d1fa0bb9262530cad96e0a9bdbab0d9344
Diffstat (limited to 'WallpaperPicker')
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
index 3f90203..659c306 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -1132,6 +1132,11 @@ public class WallpaperPickerActivity extends WallpaperCropActivity {
@Override
public boolean enableRotation() {
- return Utilities.isRotationEnabled(getContext());
+ // Check if rotation is enabled for this device.
+ if (Utilities.isRotationAllowedForDevice(getContext()))
+ return true;
+
+ // Check if the user has specifically enabled rotation via preferences.
+ return Utilities.isAllowRotationPrefEnabled(getApplicationContext());
}
}