aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDvTonder <david.vantonder@gmail.com>2012-10-31 20:13:41 -0400
committerDvTonder <david.vantonder@gmail.com>2012-10-31 20:13:41 -0400
commit432c1f57858bd244ea2b929d1d40cd038bfdaa50 (patch)
treeae151c0d2f140893881be44f0553b4a2a961006e /src
parent524b82ae1791d112abbb6d3b39fd4a387c41b359 (diff)
downloadandroid_packages_apps_CMFileManager-432c1f57858bd244ea2b929d1d40cd038bfdaa50.tar.gz
android_packages_apps_CMFileManager-432c1f57858bd244ea2b929d1d40cd038bfdaa50.tar.bz2
android_packages_apps_CMFileManager-432c1f57858bd244ea2b929d1d40cd038bfdaa50.zip
Initial tablet support
Change-Id: I612522291556d6c235df20ef9fe7e1cf450c5a80
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java9
-rw-r--r--src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java1
-rw-r--r--src/com/cyanogenmod/filemanager/activities/EditorActivity.java7
-rw-r--r--src/com/cyanogenmod/filemanager/activities/HistoryActivity.java8
-rw-r--r--src/com/cyanogenmod/filemanager/activities/NavigationActivity.java8
-rw-r--r--src/com/cyanogenmod/filemanager/activities/PickerActivity.java7
-rw-r--r--src/com/cyanogenmod/filemanager/activities/SearchActivity.java10
-rw-r--r--src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java4
8 files changed, 39 insertions, 15 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java b/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java
index c2d1b1d5..18e0f3d3 100644
--- a/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/BookmarksActivity.java
@@ -52,6 +52,7 @@ import com.cyanogenmod.filemanager.ui.dialogs.InitialDirectoryDialog;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerListener;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerResponder;
+import com.cyanogenmod.filemanager.util.AndroidHelper;
import com.cyanogenmod.filemanager.util.CommandHelper;
import com.cyanogenmod.filemanager.util.DialogHelper;
import com.cyanogenmod.filemanager.util.ExceptionUtil;
@@ -150,7 +151,12 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
this.mChRooted = FileManagerApplication.getAccessMode().compareTo(AccessMode.SAFE) == 0;
//Request features
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
+
//Set in transition
overridePendingTransition(R.anim.translate_to_right_in, R.anim.hold_out);
@@ -551,4 +557,3 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
return bookmarks;
}
}
-
diff --git a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
index 08e46cbb..96b6698b 100644
--- a/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ChangeLogActivity.java
@@ -111,5 +111,4 @@ public class ChangeLogActivity extends Activity implements OnCancelListener, OnD
finish();
}
-
}
diff --git a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
index 70e3627d..e6e05ce9 100644
--- a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
@@ -47,6 +47,7 @@ import com.cyanogenmod.filemanager.console.RelaunchableException;
import com.cyanogenmod.filemanager.model.FileSystemObject;
import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
+import com.cyanogenmod.filemanager.util.AndroidHelper;
import com.cyanogenmod.filemanager.util.CommandHelper;
import com.cyanogenmod.filemanager.util.DialogHelper;
import com.cyanogenmod.filemanager.util.ExceptionUtil;
@@ -265,7 +266,11 @@ public class EditorActivity extends Activity implements TextWatcher {
}
//Request features
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
//Set the main layout of the activity
setContentView(R.layout.editor);
diff --git a/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java b/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java
index d109fa09..902e374e 100644
--- a/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/HistoryActivity.java
@@ -89,7 +89,12 @@ public class HistoryActivity extends Activity implements OnItemClickListener {
this.mIsClearHistory = false;
//Request features
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
+
//Set in transition
overridePendingTransition(R.anim.translate_to_right_in, R.anim.hold_out);
@@ -335,4 +340,3 @@ public class HistoryActivity extends Activity implements OnItemClickListener {
popup.show();
}
}
-
diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
index 295c3d81..dc503e9d 100644
--- a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -288,6 +288,13 @@ public class NavigationActivity extends Activity
//Set the main layout of the activity
setContentView(R.layout.navigation);
+ //Request features
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
+
// Show welcome message
showWelcomeMsg();
@@ -627,7 +634,6 @@ public class NavigationActivity extends Activity
}
}
-
/**
* {@inheritDoc}
*/
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
index 9fe0a420..c20369de 100644
--- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
@@ -48,6 +48,7 @@ import com.cyanogenmod.filemanager.ui.widgets.Breadcrumb;
import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
import com.cyanogenmod.filemanager.ui.widgets.NavigationView;
import com.cyanogenmod.filemanager.ui.widgets.NavigationView.OnFilePickedListener;
+import com.cyanogenmod.filemanager.util.AndroidHelper;
import com.cyanogenmod.filemanager.util.DialogHelper;
import com.cyanogenmod.filemanager.util.ExceptionUtil;
import com.cyanogenmod.filemanager.util.FileHelper;
@@ -87,7 +88,11 @@ public class PickerActivity extends Activity
}
//Request features
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
// Initialize the activity
init();
diff --git a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
index 0375b997..df737d29 100644
--- a/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/SearchActivity.java
@@ -74,6 +74,7 @@ import com.cyanogenmod.filemanager.ui.widgets.ButtonItem;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerListener;
import com.cyanogenmod.filemanager.ui.widgets.FlingerListView.OnItemFlingerResponder;
+import com.cyanogenmod.filemanager.util.AndroidHelper;
import com.cyanogenmod.filemanager.util.CommandHelper;
import com.cyanogenmod.filemanager.util.DialogHelper;
import com.cyanogenmod.filemanager.util.ExceptionUtil;
@@ -264,7 +265,12 @@ public class SearchActivity extends Activity
registerReceiver(this.mOnSettingChangeReceiver, filter);
//Request features
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ if (!AndroidHelper.isTablet(this)) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ } else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
+
//Set in transition
overridePendingTransition(R.anim.translate_to_right_in, R.anim.hold_out);
@@ -586,7 +592,6 @@ public class SearchActivity extends Activity
this.mSearchTerms.setText(
Html.fromHtml(getString(R.string.search_terms, query.getTerms())));
-
//Now, do the search in background
this.mSearchListView.post(new Runnable() {
@Override
@@ -721,7 +726,6 @@ public class SearchActivity extends Activity
});
}
-
/**
* Method that filter the user queries for valid queries only.<br/>
* <br/>
diff --git a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
index 15ee8df4..6c87189e 100644
--- a/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/ShortcutActivity.java
@@ -129,8 +129,6 @@ public class ShortcutActivity extends Activity implements OnCancelListener, OnDi
return;
}
-
-
// Check what type of shortcut is registered and apply the best action
if (type.compareTo(SHORTCUT_TYPE_NAVIGATE) == 0) {
// We have to finish here; this activity is only a wrapper
@@ -143,8 +141,6 @@ public class ShortcutActivity extends Activity implements OnCancelListener, OnDi
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
-
-
} else {
// Open the file. Delegate in action policy
IntentsActionPolicy.openFileSystemObject(this, fso, false, this, this);