diff options
author | Arne Coucheron <arco68@gmail.com> | 2017-06-24 06:44:14 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-06-25 00:12:47 +0200 |
commit | 8b8de5f5bef86df3a3150ad207c730edf13d2273 (patch) | |
tree | 7fe30391662e97660b7420a348d5349885d463a9 | |
parent | e4411d635c9bb2792b34059590766fe25105c24e (diff) | |
download | android_packages_apps_Trebuchet-8b8de5f5bef86df3a3150ad207c730edf13d2273.tar.gz android_packages_apps_Trebuchet-8b8de5f5bef86df3a3150ad207c730edf13d2273.tar.bz2 android_packages_apps_Trebuchet-8b8de5f5bef86df3a3150ad207c730edf13d2273.zip |
Trebuchet: Rename settings provider
Rename in order to avoid conflicts with AOSP launcher and
other launchers based on it.
Change-Id: Ib44f96add26d0f60d08e642044b1cde35f489cd3
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/BaseContainerView.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/DynamicGridSizeFragment.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/Folder.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/FolderPagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/InvariantDeviceProfile.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/Utilities.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/config/ProviderConfig.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/settings/SettingsProvider.java | 2 |
16 files changed, 20 insertions, 19 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a7038ba73..79edd3432 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -169,7 +169,7 @@ <!-- The settings provider contains Home's data, like the workspace favorites --> <provider android:name="com.android.launcher3.LauncherProvider" - android:authorities="com.android.launcher3.settings" + android:authorities="com.cyanogenmod.trebuchet.settings" android:exported="true" android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS" android:readPermission="com.android.launcher3.permission.READ_SETTINGS" /> diff --git a/src/com/android/launcher3/BaseContainerView.java b/src/com/android/launcher3/BaseContainerView.java index dfc2d7b9c..95211ada5 100644 --- a/src/com/android/launcher3/BaseContainerView.java +++ b/src/com/android/launcher3/BaseContainerView.java @@ -26,7 +26,7 @@ import android.view.ViewStub; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.launcher3.settings.SettingsProvider; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; /** * A base container view, which supports resizing. @@ -213,4 +213,4 @@ public abstract class BaseContainerView extends LinearLayout implements Insettab searchBarBounds.right <= getMeasuredWidth() && searchBarBounds.bottom <= getMeasuredHeight(); } -}
\ No newline at end of file +} diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index e0d2234cf..24b42672f 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -31,9 +31,9 @@ import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.FrameLayout; import android.widget.LinearLayout; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.allapps.AllAppsContainerView; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; public class DeviceProfile { public final InvariantDeviceProfile inv; diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java index 103d660dd..c783d5f37 100644 --- a/src/com/android/launcher3/DynamicGridSizeFragment.java +++ b/src/com/android/launcher3/DynamicGridSizeFragment.java @@ -43,7 +43,8 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.NumberPicker; import android.widget.TextView; -import com.android.launcher3.settings.SettingsProvider; + +import com.cyanogenmod.trebuchet.settings.SettingsProvider; public class DynamicGridSizeFragment extends Fragment implements NumberPicker.OnValueChangeListener, Dialog.OnDismissListener { diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 1ac5cf85e..edbbf8401 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -68,9 +68,9 @@ import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.UninstallDropTarget.UninstallSource; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.UiThreadCircularReveal; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import static cyanogenmod.content.Intent.ACTION_PROTECTED; import static cyanogenmod.content.Intent.EXTRA_PROTECTED_COMPONENTS; diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index 9134dc93e..39346ab2f 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -31,8 +31,8 @@ import android.view.animation.OvershootInterpolator; import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener; import com.android.launcher3.PageIndicator.PageMarkerResources; import com.android.launcher3.Workspace.ItemOperator; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.Thunk; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index e21a070ad..754795f9d 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -24,8 +24,8 @@ import android.util.DisplayMetrics; import android.view.Display; import android.view.WindowManager; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.Thunk; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.util.ArrayList; import java.util.Collections; @@ -376,4 +376,4 @@ public class InvariantDeviceProfile { } return (float) (WEIGHT_EFFICIENT / Math.pow(d, pow)); } -}
\ No newline at end of file +} diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 6d021d1fe..1ae6518f9 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -113,7 +113,6 @@ import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.list.SettingsPinnedHeaderAdapter; import com.android.launcher3.model.WidgetsModel; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.stats.LauncherStats; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.LongArrayMap; @@ -122,6 +121,7 @@ import com.android.launcher3.util.Thunk; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.WidgetHostViewLoader; import com.android.launcher3.widget.WidgetsContainerView; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.io.File; import java.io.FileDescriptor; diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 2074ad668..2e582f1ee 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -64,9 +64,9 @@ import com.android.launcher3.util.CursorIconInfo; import com.android.launcher3.util.LongArrayMap; import com.android.launcher3.util.ManagedProfileHeuristic; import com.android.launcher3.util.Thunk; -import cyanogenmod.providers.CMSettings; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; -import com.android.launcher3.settings.SettingsProvider; +import cyanogenmod.providers.CMSettings; import java.lang.ref.WeakReference; import java.net.URISyntaxException; diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index c7ff19f7f..24a50ca62 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -58,7 +58,7 @@ import android.util.TypedValue; import android.view.View; import android.widget.Toast; -import com.android.launcher3.settings.SettingsProvider; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 067228663..c6f511704 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -69,12 +69,12 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource; import com.android.launcher3.accessibility.OverviewScreenAccessibilityDelegate; import com.android.launcher3.compat.UserHandleCompat; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.LongArrayMap; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.WallpaperUtils; import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddWidgetInfo; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 989148f89..3d173ec29 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -48,9 +48,9 @@ import com.android.launcher3.LauncherTransitionable; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.Thunk; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 12cda2571..23df5d084 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -45,8 +45,8 @@ import com.android.launcher3.ProtectedComponentsHelper; import com.android.launcher3.R; import com.android.launcher3.RemoteFolderManager; import com.android.launcher3.Utilities; -import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.util.Thunk; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; import java.util.HashMap; import java.util.List; diff --git a/src/com/android/launcher3/config/ProviderConfig.java b/src/com/android/launcher3/config/ProviderConfig.java index e8930d063..9e905ea29 100644 --- a/src/com/android/launcher3/config/ProviderConfig.java +++ b/src/com/android/launcher3/config/ProviderConfig.java @@ -18,5 +18,5 @@ package com.android.launcher3.config; public class ProviderConfig { - public static final String AUTHORITY = "com.android.launcher3.settings".intern(); + public static final String AUTHORITY = "com.cyanogenmod.trebuchet.settings".intern(); } diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index 4b51aac5a..595f93d40 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -20,7 +20,7 @@ import com.android.launcher3.LauncherSettings; import com.android.launcher3.OverviewSettingsPanel; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.settings.SettingsProvider; +import com.cyanogenmod.trebuchet.settings.SettingsProvider; public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { public static final String ACTION_SEARCH_BAR_VISIBILITY_CHANGED = diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java index e809a8a0d..167733355 100644 --- a/src/com/android/launcher3/settings/SettingsProvider.java +++ b/src/com/android/launcher3/settings/SettingsProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.settings; +package com.cyanogenmod.trebuchet.settings; import android.content.Context; import android.content.SharedPreferences; |