Sync to ub-tv-er at d42edb5e9834a40dacf6dcd2d33f983362a33994

This changes the app name to "Live TV"

Bug: 22959084
Change-Id: I66f5579e7b949485a73f80f1ac614a35f986c112

4 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/tv/LauncherActivity.java b/src/com/android/tv/LauncherActivity.java
index 96742485..b2ecf726 100644
--- a/src/com/android/tv/LauncherActivity.java
+++ b/src/com/android/tv/LauncherActivity.java
@@ -27,7 +27,7 @@ import android.util.Log;
  * An activity to launch a new activity.
  *
  * <p>In the case when {@link MainActivity} starts a new activity using
- * {@link Activity#startActivity} or {@link Activity#startActivityForResult}, Live Channels app is
+ * {@link Activity#startActivity} or {@link Activity#startActivityForResult}, Live TV app is
  * terminated if the new activity crashes. That's because the {@link android.app.ActivityManager}
  * terminates the activity which is just below the crashed activity in the activity stack. To avoid
  * this, we need to locate an additional activity between these activities in the activity stack.
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java
index b2fed7aa..f06225c0 100644
--- a/src/com/android/tv/MainActivity.java
+++ b/src/com/android/tv/MainActivity.java
@@ -120,7 +120,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
- * The main activity for the Live Channels app.
+ * The main activity for the Live TV app.
  */
 public class MainActivity extends Activity implements AudioManager.OnAudioFocusChangeListener {
     private static final String TAG = "MainActivity";
diff --git a/src/com/android/tv/TimeShiftManager.java b/src/com/android/tv/TimeShiftManager.java
index 5b998280..e606b417 100644
--- a/src/com/android/tv/TimeShiftManager.java
+++ b/src/com/android/tv/TimeShiftManager.java
@@ -49,7 +49,7 @@ import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
 /**
- * A class which manages the time shift feature in Live Channels. It consists of two parts.
+ * A class which manages the time shift feature in Live TV. It consists of two parts.
  * {@link PlayController} controls the playback such as play/pause, rewind and fast-forward using
  * {@link TunableTvView} which communicates with TvInputService through
  * {@link android.media.tv.TvInputService.Session}.
@@ -136,7 +136,7 @@ public class TimeShiftManager {
             DISABLE_ACTION_THRESHOLD + 3 * REQUEST_CURRENT_POSITION_INTERVAL;
     /**
      * The current position sent from TIS can not be exactly the same as the current system time
-     * due to the elapsed time to pass the message from TIS to Live Channels.
+     * due to the elapsed time to pass the message from TIS to Live TV.
      * So the boundary threshold is necessary.
      * The same goes for the recording start time.
      * It must be three times longer than {@link #REQUEST_CURRENT_POSITION_INTERVAL} at least.
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java
index 308e0135..4f73f1ec 100644
--- a/src/com/android/tv/TvApplication.java
+++ b/src/com/android/tv/TvApplication.java
@@ -54,7 +54,7 @@ public class TvApplication extends Application {
             Log.w(TAG, "Unable to get version name.", e);
             versionName = "";
         }
-        if (DEBUG) Log.d(TAG, "Starting Live Channels " + versionName);
+        if (DEBUG) Log.d(TAG, "Starting Live TV " + versionName);
     }
 
     public Tracker getTracker() {