diff options
author | Nick Chalko <nchalko@google.com> | 2016-02-26 13:38:57 -0800 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2016-02-26 13:39:22 -0800 |
commit | ba5845f23b8fbc985890f892961abc8b39886611 (patch) | |
tree | da373b9fe1955a2c7008c2e65df5ec3f5b087454 /AndroidManifest.xml | |
parent | 1abddd9f6225298066094e20a6c29061b6af4590 (diff) | |
download | TV-ba5845f23b8fbc985890f892961abc8b39886611.tar.gz |
Sync to ub-tv-interns at cc7c29d2a24a1343498f6d95ca5a79e003e6aefe
Change-Id: I580da190231e47c65b69f425b30ec4685eb50ce4
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9f8a67ad..9790798c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -100,6 +100,10 @@ android:launchMode="singleTop" android:theme="@style/Theme.Setup.GuidedStep" /> + <activity android:name=".dvr.ui.DvrActivity" + android:launchMode="singleTask" + android:theme="@style/Theme.Leanback.Browse" /> + <provider android:name="com.android.tv.search.LocalSearchProvider" android:authorities="com.android.tv.search" android:exported="true" @@ -142,18 +146,16 @@ </receiver> <!-- USB tuner components definition --> - <activity android:name="com.android.usbtuner.TunerSetupActivity" + <activity android:name="com.android.usbtuner.setup.TunerSetupActivity" android:label="@string/ut_app_name" android:launchMode="singleInstance" android:process="com.android.usbtuner" - android:theme="@style/Theme.UsbTunerSetup.Leanback.GuidedStep" > + android:theme="@style/Theme.Setup.GuidedStep" > <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> </activity> - <activity android:name="com.android.usbtuner.ScanActivity" - android:process="com.android.usbtuner" - android:theme="@style/Theme.Leanback" /> + <activity android:name=".dvr.DvrPlayActivity"/> <service android:name="com.android.usbtuner.tvinput.UsbTunerTvInputService" android:enabled="false" android:process="com.android.usbtuner" |