diff options
| author | Nick Chalko <nchalko@google.com> | 2015-11-04 15:15:29 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2015-11-10 13:59:03 -0800 |
| commit | 7d67089aa1e9aa2123c3cd2f386d7019a1544db1 (patch) | |
| tree | 6f90c2065a853628dd7704788dd41b787acb6fae /AndroidManifest.xml | |
| parent | 07b043dc3db83d6d20f0e8513b946830ab00e37b (diff) | |
| download | TV-7d67089aa1e9aa2123c3cd2f386d7019a1544db1.tar.gz | |
Sync to ub-tv-glee at 1.07.007
hash dce17da9f45fc4304787b1898d9915511b1df954
Change-Id: I08ac6fc0123a6653644281155e35c11b71bc5fa0
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2fcba3de..1f2db39f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,6 +22,7 @@ <uses-permission android:name="android.permission.GLOBAL_SEARCH" tools:ignore="ProtectedPermissions"/> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_TV_LISTINGS" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS" /> <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" /> @@ -29,9 +30,6 @@ <uses-permission android:name="com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA" /> <uses-permission android:name="com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS" /> - <!-- Permissions/feature for USB tuner --> - <uses-permission android:name="android.permission.DVB_DEVICE" /> - <uses-feature android:name="android.hardware.usb.host" android:required="false" /> <!-- Limit only for Android TV --> <uses-feature android:name="android.software.leanback" android:required="true" /> @@ -83,6 +81,21 @@ <activity android:name=".LauncherActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar" /> + <activity android:name=".SetupPassthroughActivity" + android:theme="@android:style/Theme.Translucent.NoTitleBar"> + <intent-filter> + <action android:name="com.android.tv.intent.action.INPUT_SETUP" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".SelectInputActivity" + android:launchMode="singleTask" + android:theme="@style/Theme.SelectInputActivity" /> + + <activity android:name=".onboarding.OnboardingActivity" + android:launchMode="singleTop" /> + <provider android:name="com.android.tv.search.LocalSearchProvider" android:authorities="com.android.tv.search" android:exported="true" @@ -93,7 +106,7 @@ <service android:name="com.android.tv.recommendation.NotificationService" android:exported="false" /> - <receiver android:name="com.android.tv.receiver.NotificationReceiver"> + <receiver android:name="com.android.tv.receiver.BootCompletedReceiver"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> @@ -101,7 +114,7 @@ <receiver android:name="com.android.tv.receiver.PackageIntentsReceiver"> <intent-filter> <action android:name="android.intent.action.PACKAGE_ADDED" /> - <!-- PACKAGE_CHANGED for package enabled/disabled notification--> + <!-- PACKAGE_CHANGED for package enabled/disabled notification --> <action android:name="android.intent.action.PACKAGE_CHANGED" /> <action android:name="android.intent.action.PACKAGE_REMOVED" /> <data android:scheme="package"/> @@ -124,6 +137,5 @@ android:resource="@xml/tv_content_rating_systems" /> </receiver> - </application> </manifest> |