Skip to content

Commit 72955c3

Browse files
committed
Feedback updates
1 parent 3d1bc5f commit 72955c3

File tree

5 files changed

+5
-137
lines changed

5 files changed

+5
-137
lines changed

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ play-services-location = { module = "com.google.android.gms:play-services-locati
125125

126126
androidx-work-runtime-ktx = "androidx.work:work-runtime-ktx:2.9.0"
127127
androidx-core-remoteviews = "androidx.core:core-remoteviews:1.0.0"
128-
129-
130128
androidx-glance-appwidget = {group = "androidx.glance", name = "glance-appwidget", version.ref = "glance"}
131129
androidx-glance-material3 = {group = "androidx.glance", name = "glance-material3", version.ref = "glance"}
132130
androidx-graphics-core = { group = "androidx.graphics", name = "graphics-core", version = "1.0.0-beta01" }

samples/user-interface/appwidgets/src/main/AndroidManifest.xml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,6 @@
3838
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
3939
</intent-filter>
4040
</activity>
41-
<activity
42-
android:label="Canonical Layouts"
43-
android:name=".glance.layout.MainActivity"
44-
android:clearTaskOnLaunch="true"
45-
android:taskAffinity="com.example.platform.canonicallayout"
46-
android:exported="true"
47-
android:theme="@style/Theme.LayoutSamples">
48-
<intent-filter>
49-
<action android:name="android.intent.action.MAIN" />
50-
<category android:name="android.intent.category.LAUNCHER" />
51-
</intent-filter>
52-
</activity>
53-
<activity android:name=".glance.layout.ActionDemonstrationActivity" />
54-
5541
<!-- Long text variants -->
5642
<receiver
5743
android:name=".glance.layout.text.LongTextAppWidgetReceiver"
@@ -111,6 +97,8 @@
11197
</receiver>
11298

11399
<!-- Action List -->
100+
<activity android:name=".glance.layout.ActionDemonstrationActivity" />
101+
114102
<receiver
115103
android:name=".glance.layout.collections.ActionListAppWidgetAppWidgetReceiver"
116104
android:enabled="@bool/glance_appwidget_available"

samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/ActionDemonstrationActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ import androidx.compose.material3.Text
2323
import androidx.compose.ui.Alignment
2424
import androidx.compose.ui.Modifier
2525
import androidx.glance.action.ActionParameters
26+
import com.google.android.catalog.framework.ui.CatalogActivity
2627

2728
internal val ActionSourceMessageKey = ActionParameters.Key<String>("actionSourceMessageKey")
2829

2930
/**
3031
* Activity that is launched on clicks from different parts of sample widgets. Displays string
3132
* describing source of the click.
3233
*/
33-
class ActionDemonstrationActivity : ComponentActivity() {
34+
class ActionDemonstrationActivity : CatalogActivity() {
3435

3536
override fun onResume() {
3637
super.onResume()

samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/CollectionsKtx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.example.platform.ui.appwidgets.glance.layout
1818

1919
/**
20-
* This function should be rmeoved when API level is raised to 24. It exists to provide removeIf
20+
* This function should be removed when API level is raised to 24. It exists to provide removeIf
2121
* from java.util.Collection
2222
*/
2323
fun <T> MutableList<T>.removeIf(filter: (T) -> Boolean): Boolean {

samples/user-interface/appwidgets/src/main/java/com/example/platform/ui/appwidgets/glance/layout/MainActivity.kt

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)