diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-29 00:21:56 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-29 00:21:56 +0000 |
commit | c4da5e25c12ac847e26c0e9dced90a0607bc9e19 (patch) | |
tree | e688a7a473d28cff6e2afd8abb486fc6e8145c3b | |
parent | 7659e103280b4456f345db9f896571a655ff6a91 (diff) | |
parent | 7aa1e2ac53fa02a2505c743b6c9f521013fb6fc3 (diff) | |
download | TV-android14-qpr3-s2-release.tar.gz |
Snap for 11510485 from 7aa1e2ac53fa02a2505c743b6c9f521013fb6fc3 to 24Q2-releaseandroid-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android14-qpr3-s2-releaseandroid14-qpr3-release
Change-Id: I7050b2614c4f2e7099dffd9b0688c9ef7bc4da79
-rw-r--r-- | AndroidManifest_all_inputs.xml | 9 | ||||
-rw-r--r-- | AndroidManifest_common.xml | 8 | ||||
-rw-r--r-- | AndroidManifest_non_passthrough.xml | 9 |
3 files changed, 18 insertions, 8 deletions
diff --git a/AndroidManifest_all_inputs.xml b/AndroidManifest_all_inputs.xml index 026887b1..85f5b886 100644 --- a/AndroidManifest_all_inputs.xml +++ b/AndroidManifest_all_inputs.xml @@ -30,6 +30,15 @@ android:theme="@style/Theme.TV" tools:replace="android:appComponentFactory"> + <!-- providers are listed here to keep them separate from the internal versions --> + <provider android:name="com.android.tv.search.LocalSearchProvider" + android:authorities="com.android.tv.search" + android:enabled="true" + android:exported="true"> + <meta-data android:name="SupportedSwitchActionType" + android:value="CHANNEL|TVINPUT"/> + </provider> + <activity android:name="com.android.tv.MainActivity" android:configChanges="keyboard|keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" android:launchMode="singleTask" diff --git a/AndroidManifest_common.xml b/AndroidManifest_common.xml index c496678c..24e05d06 100644 --- a/AndroidManifest_common.xml +++ b/AndroidManifest_common.xml @@ -87,14 +87,6 @@ android:theme="@style/Theme.TV" tools:replace="android:appComponentFactory"> - <!-- providers are listed here to keep them separate from the internal versions --> - <provider android:name="com.android.tv.search.LocalSearchProvider" - android:authorities="com.android.tv.search" - android:enabled="true" - android:exported="true"> - <meta-data android:name="SupportedSwitchActionType" - android:value="CHANNEL|TVINPUT"/> - </provider> <provider android:name="com.android.tv.common.CommonPreferenceProvider" android:authorities="com.android.tv.common.preferences" android:exported="false" diff --git a/AndroidManifest_non_passthrough.xml b/AndroidManifest_non_passthrough.xml index 5c8d8c0a..c4633ed3 100644 --- a/AndroidManifest_non_passthrough.xml +++ b/AndroidManifest_non_passthrough.xml @@ -30,6 +30,15 @@ android:theme="@style/Theme.TV" tools:replace="android:appComponentFactory"> + <!-- providers are listed here to keep them separate from the internal versions --> + <provider android:name="com.android.tv.search.LocalSearchProvider" + android:authorities="com.android.tv.search" + android:enabled="true" + android:exported="true"> + <meta-data android:name="SupportedSwitchActionType" + android:value="CHANNEL"/> + </provider> + <activity android:name="com.android.tv.MainActivity" android:configChanges="keyboard|keyboardHidden|screenSize|smallestScreenSize|screenLayout|orientation" android:launchMode="singleTask" |