Move preferences related code to sub-package.

Change-Id: Idbdcaca4577def4d4a1e44dfb8894adde44a6cbc

8 files changed, 13 insertions, 11 deletions

diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index c9db7ccac..1b121b455 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -46,13 +46,13 @@ import com.android.documentsui.AbstractActionHandler.CommonAddons;
 import com.android.documentsui.Injector.Injected;
 import com.android.documentsui.NavigationViewManager.Breadcrumb;
 import com.android.documentsui.base.DocumentInfo;
-import com.android.documentsui.base.LocalPreferences;
 import com.android.documentsui.base.RootInfo;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.base.State;
 import com.android.documentsui.base.State.ViewMode;
 import com.android.documentsui.dirlist.AnimationView;
 import com.android.documentsui.dirlist.DirectoryFragment;
+import com.android.documentsui.prefs.LocalPreferences;
 import com.android.documentsui.queries.DebugCommandProcessor;
 import com.android.documentsui.queries.SearchViewManager;
 import com.android.documentsui.queries.SearchViewManager.SearchManagerListener;
diff --git a/src/com/android/documentsui/Injector.java b/src/com/android/documentsui/Injector.java
index 4c767ae3c..81a7773ec 100644
--- a/src/com/android/documentsui/Injector.java
+++ b/src/com/android/documentsui/Injector.java
@@ -25,9 +25,9 @@ import android.view.View;
 
 import com.android.documentsui.MenuManager.SelectionDetails;
 import com.android.documentsui.base.EventHandler;
-import com.android.documentsui.base.ScopedPreferences;
 import com.android.documentsui.dirlist.DocumentsAdapter;
 import com.android.documentsui.dirlist.Model;
+import com.android.documentsui.prefs.ScopedPreferences;
 import com.android.documentsui.selection.SelectionManager;
 import com.android.documentsui.selection.SelectionManager.SelectionPredicate;
 import com.android.documentsui.ui.DialogController;
diff --git a/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/src/com/android/documentsui/OpenExternalDirectoryActivity.java
index 44ccc1ea9..74af224b5 100644
--- a/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ b/src/com/android/documentsui/OpenExternalDirectoryActivity.java
@@ -29,11 +29,11 @@ import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_INVALID_AR
 import static com.android.documentsui.Metrics.SCOPED_DIRECTORY_ACCESS_INVALID_DIRECTORY;
 import static com.android.documentsui.Metrics.logInvalidScopedAccessRequest;
 import static com.android.documentsui.Metrics.logValidScopedAccessRequest;
-import static com.android.documentsui.base.LocalPreferences.PERMISSION_ASK_AGAIN;
-import static com.android.documentsui.base.LocalPreferences.PERMISSION_NEVER_ASK;
-import static com.android.documentsui.base.LocalPreferences.getScopedAccessPermissionStatus;
-import static com.android.documentsui.base.LocalPreferences.setScopedAccessPermissionStatus;
 import static com.android.documentsui.base.Shared.DEBUG;
+import static com.android.documentsui.prefs.LocalPreferences.PERMISSION_ASK_AGAIN;
+import static com.android.documentsui.prefs.LocalPreferences.PERMISSION_NEVER_ASK;
+import static com.android.documentsui.prefs.LocalPreferences.getScopedAccessPermissionStatus;
+import static com.android.documentsui.prefs.LocalPreferences.setScopedAccessPermissionStatus;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/src/com/android/documentsui/PackageReceiver.java b/src/com/android/documentsui/PackageReceiver.java
index 9c4ebf537..5cb28272b 100644
--- a/src/com/android/documentsui/PackageReceiver.java
+++ b/src/com/android/documentsui/PackageReceiver.java
@@ -22,8 +22,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.android.documentsui.base.LocalPreferences;
 import com.android.documentsui.picker.LastAccessedProvider;
+import com.android.documentsui.prefs.LocalPreferences;
 
 /**
  * Clean up {@link LastAccessedProvider} and {@link LocalPreferences} when packages are removed.
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 85c140aff..bbeb6238b 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -47,11 +47,11 @@ import com.android.documentsui.SharedInputHandler;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.DocumentStack;
 import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.base.ScopedPreferences;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.base.State;
 import com.android.documentsui.clipping.DocumentClipper;
 import com.android.documentsui.dirlist.AnimationView.AnimationType;
+import com.android.documentsui.prefs.ScopedPreferences;
 import com.android.documentsui.dirlist.DirectoryFragment;
 import com.android.documentsui.selection.SelectionManager;
 import com.android.documentsui.services.FileOperationService;
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index b0b4ff49a..8c5961f06 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -56,11 +56,11 @@ import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.MimeTypes;
 import com.android.documentsui.base.PairedTask;
 import com.android.documentsui.base.RootInfo;
-import com.android.documentsui.base.ScopedPreferences;
 import com.android.documentsui.base.Shared;
 import com.android.documentsui.base.State;
 import com.android.documentsui.dirlist.DirectoryFragment;
 import com.android.documentsui.picker.LastAccessedProvider.Columns;
+import com.android.documentsui.prefs.ScopedPreferences;
 import com.android.documentsui.selection.SelectionManager;
 import com.android.documentsui.services.FileOperationService;
 import com.android.documentsui.sidebar.RootsFragment;
diff --git a/src/com/android/documentsui/base/LocalPreferences.java b/src/com/android/documentsui/prefs/LocalPreferences.java
index 0d1e6391a..1beaf5d1e 100644
--- a/src/com/android/documentsui/base/LocalPreferences.java
+++ b/src/com/android/documentsui/prefs/LocalPreferences.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.documentsui.base;
+package com.android.documentsui.prefs;
 
 import static com.android.documentsui.base.State.MODE_UNKNOWN;
 
@@ -26,6 +26,8 @@ import android.content.SharedPreferences.Editor;
 import android.os.UserHandle;
 import android.preference.PreferenceManager;
 
+import com.android.documentsui.base.RootInfo;
+import com.android.documentsui.base.State;
 import com.android.documentsui.base.State.ViewMode;
 
 import java.lang.annotation.Retention;
diff --git a/src/com/android/documentsui/base/ScopedPreferences.java b/src/com/android/documentsui/prefs/ScopedPreferences.java
index 92cca4919..c74753aa7 100644
--- a/src/com/android/documentsui/base/ScopedPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedPreferences.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.documentsui.base;
+package com.android.documentsui.prefs;
 
 import android.content.Context;
 import android.content.SharedPreferences;