aboutsummaryrefslogtreecommitdiff
path: root/wearable
diff options
context:
space:
mode:
authorJeremy Walker <jewalker@google.com>2017-09-06 13:34:32 -0700
committerJeremy Walker <jewalker@google.com>2017-09-06 13:34:32 -0700
commit742bf1a39f26c48ede961d3714b7ce8b9e9970a3 (patch)
treed55be43385d816ca7c3f1faec4920f419a22fd7b /wearable
parent313fb2327ba92aa3771f0d2a807be7149425bb39 (diff)
downloadandroid-742bf1a39f26c48ede961d3714b7ce8b9e9970a3.tar.gz
Adds support for vibrate on bridged notifications per external
feedback: Bug: 65414950 Test: Manually tested on both phone and wear. Change-Id: Id9e38cc1b57cc329601a301e24bc9332069547a6
Diffstat (limited to 'wearable')
-rw-r--r--wearable/wear/WearNotifications/Application/src/main/java/com/example/android/wearable/wear/wearnotifications/MainActivity.java4
-rw-r--r--wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/wearable/wear/WearNotifications/Application/src/main/java/com/example/android/wearable/wear/wearnotifications/MainActivity.java b/wearable/wear/WearNotifications/Application/src/main/java/com/example/android/wearable/wear/wearnotifications/MainActivity.java
index 004f2de6..ec7e1888 100644
--- a/wearable/wear/WearNotifications/Application/src/main/java/com/example/android/wearable/wear/wearnotifications/MainActivity.java
+++ b/wearable/wear/WearNotifications/Application/src/main/java/com/example/android/wearable/wear/wearnotifications/MainActivity.java
@@ -304,6 +304,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
getResources(),
R.drawable.ic_alarm_white_48dp))
.setContentIntent(notifyPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -473,6 +474,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -610,6 +612,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -789,6 +792,7 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
diff --git a/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java b/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
index 28fa1e5d..eb8842cc 100644
--- a/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
+++ b/wearable/wear/WearNotifications/Wearable/src/main/java/com/example/android/wearable/wear/wearnotifications/StandaloneMainActivity.java
@@ -284,6 +284,7 @@ public class StandaloneMainActivity extends WearableActivity {
.setLargeIcon(BitmapFactory.decodeResource(
getResources(),
R.drawable.ic_alarm_white_48dp))
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -453,6 +454,7 @@ public class StandaloneMainActivity extends WearableActivity {
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -554,6 +556,7 @@ public class StandaloneMainActivity extends WearableActivity {
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))
@@ -710,6 +713,7 @@ public class StandaloneMainActivity extends WearableActivity {
getResources(),
R.drawable.ic_person_black_48dp))
.setContentIntent(mainPendingIntent)
+ .setDefaults(NotificationCompat.DEFAULT_ALL)
// Set primary color (important for Wear 2.0 Notifications).
.setColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary))