Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e11a11a authored by George Chan's avatar George Chan Committed by Android (Google) Code Review
Browse files

Merge "Revert "Added transparency-metadata display.""

parents c14a64e2 f9b20b0f

AndroidManifest.xml

+0 −11
Original line number Diff line number Diff line
@@ -4654,17 +4654,6 @@ 
                       android:value="UsageStats"/>

        </activity-alias>



        <activity

            android:name="com.android.settings.applications.mobilebundledapps.MobileBundledAppDetailsActivity"

            android:label="@string/mobile_bundled_apps_details_title"

            android:exported="true"

            android:icon="@drawable/ic_homepage_connected_device">

            <intent-filter android:priority="1">

                <action android:name="android.settings.TRANSPARENCY_METADATA" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->

        <provider

            android:name="androidx.startup.InitializationProvider"

res/layout/mobile_bundled_apps_details_fragment.xml

deleted100644 → 0
+0 −107
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/app_details_layout"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:padding="10dp">



    <TextView

        android:id="@+id/contains_ads_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_contains_ad_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <TextView

        android:id="@+id/contains_ads"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/developer_info_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_developer_info_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <LinearLayout

        android:id="@+id/developer_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical" />



    <TextView

        android:id="@+id/contact_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_contact_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <TextView

        android:id="@+id/contact_url"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

    <TextView

        android:id="@+id/contact_email"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/description_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_description_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <TextView

        android:id="@+id/description"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/privacy_policy_url_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_privacy_policy_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <TextView

        android:id="@+id/privacy_policy_url"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/category_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:text="@string/mobile_bundled_apps_details_category_title"

        android:textSize="18sp"

        android:textStyle="bold" />

    <TextView

        android:id="@+id/category"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

</LinearLayout>

res/layout/mobile_bundled_apps_developer_fragment_row.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:padding="10dp">

    <TextView

        android:id="@+id/mba_info"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="14sp"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"/>

    <TextView

        android:id="@+id/developer_name"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

    <TextView

        android:id="@+id/developer_relationship"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

    <TextView

        android:id="@+id/developer_email"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

    <TextView

        android:id="@+id/developer_country"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textSize="12sp" />

</LinearLayout>
 
 No newline at end of file

res/values/strings.xml

+7 −22
Original line number Diff line number Diff line
@@ -11882,26 +11882,11 @@ 
    <!-- [CHAR LIMIT=NONE] Hint for QR code process failure -->

    <string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>













    <!-- Mobile Bundled Apps Transparency Metadata-->

























    <!-- [CHAR_LIMIT=NONE] Label for mobile bundled apps screen -->













    <string name="mobile_bundled_apps">Mobile bundled apps</string>













    <!-- [CHAR_LIMIT=NONE] Title for mobile bundled apps screen -->













    <string name="mobile_bundled_apps_title">Mobile bundled apps</string>













    <!-- [CHAR_LIMIT=NONE] Title for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_title">Mobile bundled apps transparency info</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_contains_ad_title">Contains ads</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_developer_info_title">Developer(s) Information</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_contact_title">Contact Information</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_description_title">Description</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_privacy_policy_title">Privacy Policy</string>













    <!-- [CHAR_LIMIT=NONE] Subheading for mobile bundled apps transparency information details screen -->













    <string name="mobile_bundled_apps_details_category_title">Category</string>













    <!-- [CHAR_LIMIT=NONE] Summary for App Details in App Info page if app is mobile bundled app -->













    <string name="app_install_details_mba_summary">Mobile Bundled App</string>













    <!-- Accessibility Software Cursor -->

























    <!-- [CHAR LIMIT=NONE] Title for Accessibility Software Cursor setting for trigger hints. -->













    <string name="software_cursor_trigger_hints_enabled_title" translatable="false">Gesture detection area hints</string>













    <!-- [CHAR LIMIT=NONE] Title for Accessibility Software Cursor setting for keyboard shift. -->













    <string name="software_cursor_trigger_keyboard_shift_enabled_title" translatable="false">Shift gesture detection region above keyboard</string>



























</resources>

























res/xml/mobile_bundled_apps_details_preference.xml
deleted100644 → 0



+0
−26




























Original line number
Diff line number
Diff line













<?xml version="1.0" encoding="utf-8"?>



























<!-- Copyright (C) 2022 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.













-->



























<PreferenceScreen













    xmlns:android="http://schemas.android.com/apk/res/android"













    xmlns:settings="http://schemas.android.com/apk/res-auto"













    android:title="">













    <com.android.settingslib.widget.LayoutPreference













        android:key="metadata"













        android:selectable="false"













        android:layout="@layout/mobile_bundled_apps_details_fragment" />













</PreferenceScreen>










 No newline at end of file