Correct application ID to app.lawnchair

AndroidManifest.xml

@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="com.lawnchair.LawnchairLauncher"
+            android:name="app.lawnchair.LawnchairLauncher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"

build.gradle

@@ -118,7 +118,7 @@ android {
 
         lawn {
             dimension "app"
-            applicationId 'com.lawnchair'
+            applicationId 'app.lawnchair'
             testApplicationId 'com.android.launcher3.tests'
         }
 

lawnchair/AndroidManifest.xml

@@ -17,9 +17,9 @@
 */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application android:name="com.lawnchair.ui.LawnchairApp">
+    <application android:name="app.lawnchair.ui.LawnchairApp">
         <activity
-            android:name="com.lawnchair.ui.preferences.PreferenceActivity"
+            android:name="app.lawnchair.ui.preferences.PreferenceActivity"
             android:autoRemoveFromRecents="true"
             android:label="@string/settings_button_text"
             android:theme="@style/Theme.Lawnchair">

lawnchair/res/layout/search_container_all_apps.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.lawnchair.nexuslauncher.HotseatQsb
+<app.lawnchair.nexuslauncher.HotseatQsb
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/search_container_all_apps"
@@ -9,7 +9,7 @@
 
     <fragment
         android:id="@+id/search_wrapper_view"
-        android:name="com.lawnchair.nexuslauncher.HotseatQsb$HotseatQsbFragment"
+        android:name="app.lawnchair.nexuslauncher.HotseatQsb$HotseatQsbFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:tag="qsb_view"
@@ -38,4 +38,4 @@
         android:textColorHint="@drawable/all_apps_search_hint"
         android:textSize="16sp"
         android:visibility="invisible" />
-</com.lawnchair.nexuslauncher.HotseatQsb>
+</app.lawnchair.nexuslauncher.HotseatQsb>

lawnchair/res/layout/search_container_workspace.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.lawnchair.nexuslauncher.SmartspaceQsb
+<app.lawnchair.nexuslauncher.SmartspaceQsb
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/search_container_workspace"
@@ -7,10 +7,10 @@
     android:layout_height="0dp">
 
     <fragment
-        android:name="com.lawnchair.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
+        android:name="app.lawnchair.nexuslauncher.SmartspaceQsb$SmartSpaceFragment"
         android:layout_width="match_parent"
         android:tag="smart_space_view"
         android:layout_height="match_parent"
         tools:ignore="FragmentTagUsage" />
 
-</com.lawnchair.nexuslauncher.SmartspaceQsb>
+</app.lawnchair.nexuslauncher.SmartspaceQsb>

lawnchair/src/app/lawnchair/FeedBridge.kt

@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair
+package app.lawnchair
 
 import android.content.Context
 import android.content.Intent
@@ -24,8 +24,8 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Process
 import android.util.Log
-import com.lawnchair.util.SingletonHolder
-import com.lawnchair.util.preferences.LawnchairPreferences
+import app.lawnchair.util.SingletonHolder
+import app.lawnchair.util.preferences.LawnchairPreferences
 import com.android.launcher3.BuildConfig
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
@@ -37,7 +37,7 @@ class FeedBridge(private val context: Context) {
     private val bridgePackages by lazy {
         listOf(
             PixelBridgeInfo("com.google.android.apps.nexuslauncher", R.integer.bridge_signature_hash),
-            BridgeInfo("com.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
+            BridgeInfo("app.lawnchair.lawnfeed", R.integer.lawnfeed_signature_hash)
         )
     }
 

lawnchair/src/app/lawnchair/LawnchairLauncher.java

@@ -1,9 +1,9 @@
-package com.lawnchair;
+package app.lawnchair;
 
 import com.android.launcher3.Launcher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
+import app.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncher extends Launcher {
     @Override

lawnchair/src/app/lawnchair/LawnchairLauncherQuickstep.java

@@ -1,9 +1,9 @@
-package com.lawnchair;
+package app.lawnchair;
 
 import com.android.launcher3.uioverrides.QuickstepLauncher;
 import com.android.systemui.plugins.shared.LauncherOverlayManager;
 
-import com.lawnchair.nexuslauncher.OverlayCallbackImpl;
+import app.lawnchair.nexuslauncher.OverlayCallbackImpl;
 
 public class LawnchairLauncherQuickstep extends QuickstepLauncher {
     @Override

lawnchair/src/app/lawnchair/nexuslauncher/HotseatQsb.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.content.Context
 import android.graphics.Rect

lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.java

@@ -1,6 +1,6 @@
-package com.lawnchair.nexuslauncher;
+package app.lawnchair.nexuslauncher;
 
-import static com.lawnchair.util.preferences.LawnchairPreferences.ENABLE_MINUS_ONE;
+import static app.lawnchair.util.preferences.LawnchairPreferences.ENABLE_MINUS_ONE;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -17,8 +17,8 @@ import com.google.android.libraries.launcherclient.LauncherClient;
 import com.google.android.libraries.launcherclient.LauncherClientCallbacks;
 import com.google.android.libraries.launcherclient.StaticInteger;
 
-import com.lawnchair.FeedBridge;
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.FeedBridge;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Implements {@link LauncherOverlay} and passes all the corresponding events to {@link

lawnchair/src/app/lawnchair/nexuslauncher/SmartSpaceHostView.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.content.Context

lawnchair/src/app/lawnchair/nexuslauncher/SmartspaceQsb.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.nexuslauncher
+package app.lawnchair.nexuslauncher
 
 import android.annotation.SuppressLint
 import android.appwidget.AppWidgetManager

lawnchair/src/app/lawnchair/ui/LawnchairApp.kt

@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair.ui
+package app.lawnchair.ui
 
 import android.app.Activity
 import android.app.Application

lawnchair/src/app/lawnchair/ui/preferences/About.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
@@ -15,7 +15,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.lawnchair.util.preferences.getFormattedVersionName
+import app.lawnchair.util.preferences.getFormattedVersionName
 import com.android.launcher3.R
 
 @Composable

lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable

lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image

lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri

lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri

lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable

lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource

lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Build
 import androidx.compose.animation.AnimatedVisibility

lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable

lawnchair/src/app/lawnchair/ui/preferences/IconPackPreference.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.graphics.drawable.Drawable
 import androidx.compose.foundation.Image

lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri

lawnchair/src/app/lawnchair/ui/preferences/LibraryRow.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.Intent
 import android.net.Uri

lawnchair/src/app/lawnchair/ui/preferences/NavActionPreference.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*

lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.content.ComponentName
 import android.content.Intent

lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt

@@ -1,10 +1,10 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.animation.ExperimentalAnimationApi
-import com.lawnchair.ui.theme.LawnchairTheme
+import app.lawnchair.ui.theme.LawnchairTheme
 
 class PreferenceActivity : ComponentActivity() {
     @ExperimentalAnimationApi

lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryLink.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable

lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items

lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -7,7 +7,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.lawnchair.util.smartBorder
+import app.lawnchair.util.smartBorder
 
 @Composable
 fun PreferenceGroup(heading: String? = null, useTopPadding: Boolean = false, content: @Composable () -> Unit) {

lawnchair/src/app/lawnchair/ui/preferences/PreferenceInteractor.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.runtime.State
 

lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Divider

lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.app.Application
 import android.content.ComponentName
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.lawnchair.util.preferences.PrefManager
+import app.lawnchair.util.preferences.PrefManager
 import com.android.launcher3.R
 import com.android.launcher3.notification.NotificationListener
 

lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*

lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*

lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import android.os.Build
 import android.view.View
@@ -7,7 +7,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.graphics.toArgb
-import com.lawnchair.ui.theme.LawnchairTheme
+import app.lawnchair.ui.theme.LawnchairTheme
 
 @Composable
 fun SystemUi(window: Window) =

lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.preferences
+package app.lawnchair.ui.preferences
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi

lawnchair/src/app/lawnchair/ui/theme/Color.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

lawnchair/src/app/lawnchair/ui/theme/Shape.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

lawnchair/src/app/lawnchair/ui/theme/Theme.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme

lawnchair/src/app/lawnchair/ui/theme/Type.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.ui.theme
+package app.lawnchair.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

lawnchair/src/app/lawnchair/util/LawnchairUtils.kt

@@ -15,7 +15,7 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair
+package app.lawnchair
 
 import android.content.Context
 import android.os.Looper

lawnchair/src/app/lawnchair/util/SingletonHolder.kt

@@ -15,11 +15,11 @@
  *     along with Lawnchair Launcher.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.lawnchair.util
+package app.lawnchair.util
 
 import android.content.Context
-import com.lawnchair.ensureOnMainThread
-import com.lawnchair.useApplicationContext
+import app.lawnchair.ensureOnMainThread
+import app.lawnchair.useApplicationContext
 
 // Source: https://medium.com/@BladeCoder/kotlin-singletons-with-argument-194ef06edd9e
 open class SingletonHolder<out T, in A>(creator: (A) -> T) {

lawnchair/src/app/lawnchair/util/SmartBorder.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.util
+package app.lawnchair.util
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.ui.Modifier

lawnchair/src/app/lawnchair/util/preferences/Delegates.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty

lawnchair/src/app/lawnchair/util/preferences/LawnchairPreferences.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences

lawnchair/src/app/lawnchair/util/preferences/PrefManager.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.SharedPreferences

lawnchair/src/app/lawnchair/util/preferences/Versioning.kt

@@ -1,4 +1,4 @@
-package com.lawnchair.util.preferences
+package app.lawnchair.util.preferences
 
 import android.content.Context
 import android.content.pm.PackageInfo

lawnchair/src/com/google/android/libraries/launcherclient/BaseClientService.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.util.Log;
-import com.lawnchair.FeedBridge;
+import app.lawnchair.FeedBridge;
 
 public class BaseClientService implements ServiceConnection {
     private boolean mConnected;

lawnchair/src/com/google/android/libraries/launcherclient/LauncherClient.java

@@ -20,8 +20,8 @@ import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
-import com.lawnchair.FeedBridge;
-import com.lawnchair.FeedBridge.BridgeInfo;
+import app.lawnchair.FeedBridge;
+import app.lawnchair.FeedBridge.BridgeInfo;
 import java.lang.ref.WeakReference;
 
 public class LauncherClient {

quickstep/AndroidManifest-launcher.xml

@@ -43,7 +43,7 @@
         attributes and intent filters the same
         -->
         <activity
-            android:name="com.lawnchair.LawnchairLauncherQuickstep"
+            android:name="app.lawnchair.LawnchairLauncherQuickstep"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"

src/com/android/launcher3/InvariantDeviceProfile.java

@@ -62,7 +62,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 public class InvariantDeviceProfile {
 

src/com/android/launcher3/Launcher.java

@@ -201,7 +201,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * Default launcher application.

src/com/android/launcher3/Workspace.java

@@ -118,7 +118,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.function.Predicate;
 
-import com.lawnchair.util.preferences.LawnchairPreferences;
+import app.lawnchair.util.preferences.LawnchairPreferences;
 
 /**
  * The workspace is a wide area with a wallpaper and a finite number of pages.