diff options
| author | Live Channels Team <no-reply@google.com> | 2018-11-27 15:04:43 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-11-27 15:28:31 -0800 |
| commit | 21ff8fc32321cf136aaccde92bedd419c81757e3 (patch) | |
| tree | 4443f3b1f4d2ae8fe0a3a08d5b9eed4f78c54e75 /AndroidManifest.xml | |
| parent | 76866c62c5aa5434337b0ad241935ed3afca7b67 (diff) | |
| download | platform_packages_apps_TV-21ff8fc32321cf136aaccde92bedd419c81757e3.tar.gz platform_packages_apps_TV-21ff8fc32321cf136aaccde92bedd419c81757e3.tar.bz2 platform_packages_apps_TV-21ff8fc32321cf136aaccde92bedd419c81757e3.zip | |
Changes imported from Live Channels
- 223064917 Update manifest. by nchalko <nchalko@google.com>
- 223047471 Check system property to enable/disabale 3rd party inputs by shubang <shubang@google.com>
- 223014616 Update action in CurrentRecordingDetailsFragment when not... by nchalko <nchalko@google.com>
PiperOrigin-RevId: 223064917
Change-Id: Ifc4fd42a11b0caee1b636db6d0a5096b0aa12bec
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 29abe4ed..c72bd3da 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -71,6 +71,7 @@ <application android:name="com.android.tv.app.LiveTvApplication" android:allowBackup="true" + android:appComponentFactory="android.support.v4.app.CoreComponentFactory" android:banner="@drawable/live_tv_banner" android:icon="@drawable/ic_tv_app" android:label="@string/app_name" @@ -104,6 +105,8 @@ android:exported="false" android:process="com.android.tv.common" /> + + <receiver android:name="com.android.tv.livetv.receiver.GlobalKeyReceiver" android:exported="true" > @@ -126,8 +129,8 @@ <activity android:name="com.android.tv.TvActivity" - android:launchMode="singleTask" - android:exported="true" > + android:exported="true" + android:launchMode="singleTask" > <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -289,8 +292,7 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - </activity> - <!-- DVR --> + </activity> <!-- DVR --> <service android:name="com.android.tv.dvr.recorder.DvrRecordingService" android:label="@string/dvr_service_name" /> |