Skip to content

Commit f16c5a9

Browse files
committed
use same app name and launcher icon for wear and main app
1 parent ec9d01f commit f16c5a9

25 files changed

+10
-30
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@color/colorPrimary"/>
3+
<background android:drawable="@color/launcherIconBackground"/>
44
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
55
<monochrome>
66
<inset
77
android:inset="20%"
8-
android:drawable="@drawable/ic_launcher_monochrome" />
8+
android:drawable="@drawable/app_ic_launcher_monochrome" />
99
</monochrome>
1010
</adaptive-icon>
File renamed without changes.
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<color name="launcherIconBackground">#37474f</color>
5+
6+
</resources>

wear/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
}
2727

2828
buildTypes {
29-
getByName("debug") {
29+
debug {
3030
applicationIdSuffix = ".debug"
3131
}
3232
release {

wear/proguard-rules.pro

-21
This file was deleted.

wear/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
<activity
2727
android:name=".presentation.MainActivity"
2828
android:exported="true"
29-
android:label="@string/app_name"
3029
android:theme="@android:style/Theme.DeviceDefault">
3130
<intent-filter>
3231
<action android:name="android.intent.action.MAIN" />
3332

3433
<category android:name="android.intent.category.LAUNCHER" />
3534
</intent-filter>
3635
</activity>
36+
3737
</application>
3838

3939
</manifest>
-4.43 KB
Binary file not shown.
-2.64 KB
Binary file not shown.
-6.47 KB
Binary file not shown.
-10.3 KB
Binary file not shown.
Binary file not shown.

wear/src/main/res/values/strings.xml

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<resources>
2-
<string name="app_name" translatable="false">Simple Time Tracker</string>
3-
<!--
4-
This string is used for square devices and overridden by hello_world in
5-
values-round/strings.xml for round devices.
6-
-->
72
<string name="submit_button_default_content_description">Submit</string>
83
<string name="refresh_button_default_content_description">Refresh</string>
94
<string name="no_tags">No tags</string>

0 commit comments

Comments
 (0)