Skip to content

Commit 7f7eb95

Browse files
authored
Merge fad/next into master to prepare for M130 release (#4843)
* Change "user" to "tester" in app distro javadocs (#4810) * Fix notification on API level 19 (#4842) * Update firebase-appdistribution{-api} CHANGELOG and gradle.properties for M130
1 parent b68c1f6 commit 7f7eb95

File tree

12 files changed

+28
-12
lines changed

12 files changed

+28
-12
lines changed

firebase-appdistribution-api/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Unreleased
2+
* [fixed] Fixed a crash when showing feedback notification on devices running Android 4 and below.
3+
4+
# 16.0.0-beta07
25
* [feature] Adds support for attaching JPEG screenshots to tester feedback.
36

47
# 16.0.0-beta06

firebase-appdistribution-api/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=16.0.0-beta07
16-
latestReleasedVersion=16.0.0-beta06
15+
version=16.0.0-beta08
16+
latestReleasedVersion=16.0.0-beta07

firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistribution.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public interface FirebaseAppDistribution {
213213
* @param interruptionLevel the level of interruption for the feedback notification. On platforms
214214
* below Android 8, this corresponds to a <a
215215
* href="https://developer.android.com/develop/ui/views/notifications/channels#importance">notification
216-
* channel importance</a> and once set cannot be changed except by the user.
216+
* channel importance</a> and once set cannot be changed except by the tester.
217217
*/
218218
void showFeedbackNotification(
219219
@StringRes int additionalFormText, @NonNull InterruptionLevel interruptionLevel);
@@ -243,7 +243,7 @@ void showFeedbackNotification(
243243
* @param interruptionLevel the level of interruption for the feedback notification. On platforms
244244
* below Android 8, this corresponds to a <a
245245
* href="https://developer.android.com/develop/ui/views/notifications/channels#importance">notification
246-
* channel importance</a> and once set cannot be changed except by the user.
246+
* channel importance</a> and once set cannot be changed except by the tester.
247247
*/
248248
void showFeedbackNotification(
249249
@NonNull CharSequence additionalFormText, @NonNull InterruptionLevel interruptionLevel);

firebase-appdistribution/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Unreleased
2+
* [fixed] Fixed a crash when showing feedback notification on devices running Android 4 and below.
3+
4+
# 16.0.0-beta07
25
* [feature] Adds support for attaching JPEG screenshots to tester feedback.
36

47
# 16.0.0-beta06

firebase-appdistribution/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=16.0.0-beta07
16-
latestReleasedVersion=16.0.0-beta06
15+
version=16.0.0-beta08
16+
latestReleasedVersion=16.0.0-beta07

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionNotificationsManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private Notification buildFeedbackNotification(
195195
PackageManager packageManager = context.getPackageManager();
196196
CharSequence appLabel = packageManager.getApplicationLabel(applicationInfo);
197197
return new NotificationCompat.Builder(context, FEEDBACK.channelId)
198-
.setSmallIcon(R.drawable.ic_baseline_rate_review_24)
198+
.setSmallIcon(R.drawable.ic_rate_review)
199199
.setContentTitle(context.getString(R.string.feedback_notification_title))
200200
.setContentText(context.getString(R.string.feedback_notification_text, appLabel))
201201
.setPriority(interruptionLevel.notificationPriority)
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="#FFFFFF">
7+
<group android:scaleX="0.92"
8+
android:scaleY="0.92"
9+
android:translateX="0.96"
10+
android:translateY="0.96">
11+
<path
12+
android:fillColor="@android:color/white"
13+
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,14v-2.47l6.88,-6.88c0.2,-0.2 0.51,-0.2 0.71,0l1.77,1.77c0.2,0.2 0.2,0.51 0,0.71L8.47,14L6,14zM18,14h-7.5l2,-2L18,12v2z"/>
14+
</group>
15+
</vector>
Loading
Loading
Loading
Loading

firebase-appdistribution/src/main/res/drawable/ic_baseline_rate_review_24.xml

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

0 commit comments

Comments
 (0)