diff --git a/.gitignore b/.gitignore
index 7240e4877b..595a5c9083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ bin/
local.properties
gradle/
build/
-gradlew*
\ No newline at end of file
+gradlew*
+.DS_Store
\ No newline at end of file
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index ad404c09a9..4999d8746f 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -49,7 +49,8 @@
android:fullBackupOnly="true"
android:fullBackupContent="@xml/backupscheme"
android:hardwareAccelerated="true"
- android:icon="@drawable/ic_launcher_home"
+ android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/derived_app_name"
android:largeHeap="@bool/config_largeHeap"
android:restoreAnyVersion="true"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5d6914577d..41057475f1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,7 +64,8 @@
android:fullBackupOnly="true"
android:fullBackupContent="@xml/backupscheme"
android:hardwareAccelerated="true"
- android:icon="@drawable/ic_launcher_home"
+ android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/derived_app_name"
android:theme="@style/LauncherTheme"
android:largeHeap="@bool/config_largeHeap"
@@ -117,7 +118,7 @@
-->
@@ -142,7 +143,7 @@
diff --git a/build.gradle b/build.gradle
index 16ede3d512..d9560ef868 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,13 +15,13 @@ apply plugin: 'com.google.protobuf'
android {
compileSdkVersion 27
- buildToolsVersion '26.0.0'
+ buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 21
targetSdkVersion 27
versionCode 1
- versionName "3.1"
+ versionName "v2-dev"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
@@ -33,7 +33,7 @@ android {
productFlavors {
aosp {
- applicationId 'com.google.android.apps.nexuslauncher'
+ applicationId 'ch.deletescape.lawnchair'
testApplicationId 'com.android.launcher3.tests'
}
@@ -90,7 +90,7 @@ repositories {
google()
}
-final String SUPPORT_LIBS_VERSION = '26.0.+'
+final String SUPPORT_LIBS_VERSION = '27.0.2'
dependencies {
compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"
compile "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}"
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100755
index 0000000000..4ae7d12378
--- /dev/null
+++ b/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/mipmap-anydpi-v26/ic_launcher_round.xml b/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100755
index 0000000000..4ae7d12378
--- /dev/null
+++ b/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000000..f4879c34a3
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_background.png b/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100755
index 0000000000..439c2dcfb8
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_foreground.png b/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100755
index 0000000000..4dec6ba2f9
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_round.png b/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100755
index 0000000000..7219ea3ca3
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-mdpi/ic_launcher.png b/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000000..76319aafae
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_background.png b/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100755
index 0000000000..d8d9f6dda8
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_foreground.png b/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100755
index 0000000000..ed4334489a
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_round.png b/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100755
index 0000000000..896d871841
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000000..2c05d14603
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_background.png b/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100755
index 0000000000..19a6a6e4be
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_foreground.png b/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100755
index 0000000000..68146219c2
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_round.png b/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100755
index 0000000000..2d5eb12875
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..78707d3c75
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_background.png b/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100755
index 0000000000..24c633eb58
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_foreground.png b/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100755
index 0000000000..d5b0496a3b
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_round.png b/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000000..ab432a7e89
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..7453aa00d8
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_background.png b/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100755
index 0000000000..7246bd32d1
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100755
index 0000000000..2d1451d719
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_round.png b/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000000..c9ec585458
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/res/values/config.xml b/res/values/config.xml
index b338625c22..878a079c81 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -13,7 +13,7 @@
- @string/app_name_pixel_launcher
+ @string/app_name_lawnchair
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d35071fba0..4f16057af5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,7 +22,7 @@
- Launcher3
+ Lawnchair
@@ -338,4 +338,6 @@
Turn off app suggestions?
"Suggestions won't appear at the top of your apps list, and the usage data used to create them will be permanently erased."
TURN OFF
+
+ Lawnchair
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 7ebc71edbc..12e004c354 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -89,11 +89,7 @@
-
-
+ android:persistent="false" />
+ android:data="package:ch.deletescape.lawnchair" />
diff --git a/src_config/com/android/launcher3/BuildConfig.java b/src_config/com/android/launcher3/BuildConfig.java
index b54572d498..1e9f81eee2 100644
--- a/src_config/com/android/launcher3/BuildConfig.java
+++ b/src_config/com/android/launcher3/BuildConfig.java
@@ -20,5 +20,5 @@ package com.android.launcher3;
* Config file used by Make. This file is automatically generated when using gradle.
*/
public class BuildConfig {
- public static final String APPLICATION_ID = "com.google.android.apps.nexuslauncher";
+ public static final String APPLICATION_ID = "ch.deletescape.lawnchair";
}