diff options
author | Chris Wren <cwren@android.com> | 2013-10-09 18:50:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 18:50:46 +0000 |
commit | 129d71d8ceafe6e03484b59d44d34c972e92dd0d (patch) | |
tree | f37577ab3d9e0601d9f83b950ea8bd074d50b57a /src/com/android | |
parent | e81400c8b720acd566dd5f7a7081f57dbf7502c5 (diff) | |
parent | e523e70f75ff90ca5d613fb8398d37208e6cd32d (diff) | |
download | android_packages_apps_Trebuchet-129d71d8ceafe6e03484b59d44d34c972e92dd0d.tar.gz android_packages_apps_Trebuchet-129d71d8ceafe6e03484b59d44d34c972e92dd0d.tar.bz2 android_packages_apps_Trebuchet-129d71d8ceafe6e03484b59d44d34c972e92dd0d.zip |
Merge "move the provider authority to a config class" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/config/ProviderConfig.java | 22 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index d1819e14d..7e1442dce 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1623,6 +1623,7 @@ public class LauncherModel extends BroadcastReceiver { final ArrayList<Long> itemsToRemove = new ArrayList<Long>(); final Uri contentUri = LauncherSettings.Favorites.CONTENT_URI; + if (DEBUG_LOADERS) Log.d(TAG, "loading model from " + contentUri); final Cursor c = contentResolver.query(contentUri, null, null, null, null); // +1 for the hotseat (it can be larger than the workspace) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 39afe1042..d0f6770d3 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -49,8 +49,8 @@ import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import com.android.launcher3.LauncherSettings.BaseLauncherColumns; import com.android.launcher3.LauncherSettings.Favorites; +import com.android.launcher3.config.ProviderConfig; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -69,7 +69,7 @@ public class LauncherProvider extends ContentProvider { private static final int DATABASE_VERSION = 15; static final String OLD_AUTHORITY = "com.android.launcher2.settings"; - static final String AUTHORITY = "com.android.launcher3.settings"; + static final String AUTHORITY = ProviderConfig.AUTHORITY; static final String TABLE_FAVORITES = "favorites"; static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens"; diff --git a/src/com/android/launcher3/config/ProviderConfig.java b/src/com/android/launcher3/config/ProviderConfig.java new file mode 100644 index 000000000..db25076ea --- /dev/null +++ b/src/com/android/launcher3/config/ProviderConfig.java @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.launcher3.config; + +public class ProviderConfig { + + public static final String AUTHORITY = "com.android.launcher3.settings"; +} |