Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More Task Affinity 2 - Task Harder #856

Merged
merged 2 commits into from
Sep 15, 2023
Merged

More Task Affinity 2 - Task Harder #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11674f5
More Task Affinity 2 - Task Harder
yschimke Jul 13, 2023
46f7c04
Merge branch 'main' into more_affinity
yschimke Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion DataLayer/Application/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@android:style/Theme.Material.Light.NoActionBar">
android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 3 additions & 1 deletion DataLayer/Wearable/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@
</service>
<activity
android:name=".MainActivity"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
10 changes: 7 additions & 3 deletions RuntimePermissionsWear/Application/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
<activity
android:name=".MainPhoneActivity"
android:launchMode="singleTask"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -49,12 +51,14 @@
<activity
android:name=".PhonePermissionRequestActivity"
android:label="@string/title_activity_phone_permission_request"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:taskAffinity=".main"/>

<activity
android:name=".WearPermissionRequestActivity"
android:label="@string/title_activity_wear_permission_request"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:taskAffinity=".main"/>

<service
android:name=".IncomingRequestPhoneService"
Expand Down
8 changes: 6 additions & 2 deletions RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@

<activity
android:name=".MainWearActivity"
android:launchMode="singleInstance">
android:launchMode="singleInstance"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -45,7 +47,9 @@

<activity
android:name=".RequestPermissionOnPhoneActivity"
android:label="@string/title_activity_request_permission_on_phone">
android:label="@string/title_activity_request_permission_on_phone"
android:taskAffinity=".main"
>
</activity>

<service
Expand Down
4 changes: 3 additions & 1 deletion TimeText/timetexttestsupport/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.wearable.timetexttextsupport">
<application>
<activity android:name="com.example.android.wearable.timetext.TestActivity" />
<activity android:name="com.example.android.wearable.timetext.TestActivity"
android:taskAffinity=".main"
/>
</application>
</manifest>
4 changes: 3 additions & 1 deletion TimeText/wear/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@

<activity
android:name="com.example.android.wearable.timetext.MainActivity"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
4 changes: 3 additions & 1 deletion WatchFaceKotlin/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
<activity
android:name=".editor.WatchFaceConfigActivity"
android:exported="true"
android:label="@string/title_activity_watch_face_config">
android:label="@string/title_activity_watch_face_config"
android:taskAffinity=".main"
>

<intent-filter>
<action android:name="androidx.wear.watchface.editor.action.WATCH_FACE_EDITOR" />
Expand Down
4 changes: 3 additions & 1 deletion WearOAuth/oauth-device-grant/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@

<activity
android:name=".AuthDeviceGrantActivity"
android:label="wearoauth">
android:label="wearoauth"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 3 additions & 1 deletion WearOAuth/oauth-pkce/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@

<activity
android:name=".AuthPKCEActivity"
android:label="wearoauth">
android:label="wearoauth"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 3 additions & 1 deletion WearSpeakerSample/wear/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
4 changes: 3 additions & 1 deletion WearStandaloneGoogleSignIn/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@

<activity
android:name=".GoogleSignInActivity"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
6 changes: 4 additions & 2 deletions WearVerifyRemoteApp/Application/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@

<activity
android:name=".MainMobileActivity"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

</application>
</manifest>
</manifest>
6 changes: 4 additions & 2 deletions WearVerifyRemoteApp/Wearable/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@
<activity
android:name=".MainWearActivity"
android:label="@string/app_name"
android:exported="true">
android:exported="true"
android:taskAffinity=".main"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>
</manifest>
</manifest>
Loading