Merge "Apply the latest changes in TV framework for AtscTvInput"

samples/AtscTvInput/AndroidManifest.xml

@@ -26,7 +26,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <action android:name="android.media.tv.SetupActivity" />
             </intent-filter>
         </activity>
         <service android:name="com.example.android.atsctvinput.AtscTvInputService"
@@ -35,6 +34,8 @@
             <intent-filter>
                 <action android:name="android.media.tv.TvInputService" />
             </intent-filter>
+            <meta-data android:name="android.media.tv.input"
+                android:resource="@xml/atsctvinputservice" />
         </service>
     </application>
 </manifest>

samples/AtscTvInput/res/xml/atsctvinputservice.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright (c) 2014, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+    android:setupActivity="com.example.android.atsctvinput.AtscTvInputScanActivity" />