aboutsummaryrefslogtreecommitdiff
path: root/wearable/wear
diff options
context:
space:
mode:
Diffstat (limited to 'wearable/wear')
-rw-r--r--wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java2
-rw-r--r--wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java2
-rw-r--r--wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java2
-rw-r--r--wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java b/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
index f344cfee..ca6f3f05 100644
--- a/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
+++ b/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
@@ -52,7 +52,7 @@ public class MainActivity extends FragmentActivity
private static final long TIME_THRESHOLD_NS = TimeUnit.SECONDS.toNanos(2);
/**
- * Earth gravity is around 9.8 m/s^2 but user may not completely direct his/her hand vertical
+ * Earth gravity is around 9.8 m/s^2 but user may not completely direct their hand vertical
* during the exercise so we leave some room. Basically, if the x-component of gravity, as
* measured by the Gravity sensor, changes with a variation delta > 0.03 from the hand down
* and hand up threshold we define below, we consider that a successful count.
diff --git a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
index 4f9ea723..db86fb3b 100644
--- a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
+++ b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
@@ -42,7 +42,7 @@ import java.util.List;
/**
* The main activity for the handset application. When a watch device reconnects to the handset
- * app, the collected GPS data on the watch, if any, is synced up and user can see his/her track on
+ * app, the collected GPS data on the watch, if any, is synced up and user can see their track on
* a map. This data is then saved into an internal database and the corresponding data items are
* deleted.
*/
diff --git a/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java b/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
index defe9d16..44ccc536 100644
--- a/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
+++ b/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
@@ -223,7 +223,7 @@ public class MainActivity extends FragmentActivity implements
start();
} else {
// Permission has been denied before. At this point we should show a dialog to
- // user and explain why this permission is needed and direct him to go to the
+ // user and explain why this permission is needed and direct them to go to the
// Permissions settings for the app in the System settings. For this sample, we
// simply exit to get to the important part.
Toast.makeText(this, R.string.exiting_for_permissions, Toast.LENGTH_LONG).show();
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
index 8a4fea56..1a30dd5e 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
@@ -67,7 +67,7 @@ public class UtilityService extends IntentService {
}
/**
- * Trigger a message that asks the master device to start an activity.
+ * Trigger a message that asks the manager device to start an activity.
*
* @param context the context
* @param path the path that will be sent via the wearable message API