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

Commit 9709e05a authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Clean up extra app info." into tm-dev am: bd26c3c7 am: f71c92bb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962



Change-Id: Ib6e82ca9a61dd489737f7044bd09c37ddc436861
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5efac57e f71c92bb

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -13795,12 +13795,6 @@ 
    <!-- Title for if toggle access is disabled by carrier [CHAR LIMIT=NONE] -->

    <string name="enable_2g_summary_disabled_carrier"><xliff:g id="carrier_name_2g" example="Google Fi">%1$s</xliff:g> requires 2G to be available</string>

















    <!-- Label for extra app info settings for a specific app [CHAR LIMIT=40] -->









    <string name="extra_app_info_label" translatable="false"></string>









    <!-- Summary for extra app info settings for a specific app [CHAR LIMIT=40] -->









    <string name="extra_app_info_summary" translatable="false"></string>

















    <!-- Label for All Services preference in App info settings [CHAR LIMIT=40] -->









    <string name="app_info_all_services_label">All Services</string>

































res/xml/app_info_settings.xml



+0
−6






























Original line number
Diff line number
Diff line







@@ -77,12 +77,6 @@







        android:summary="@string/summary_placeholder"









        settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />



















    <Preference









        android:key="extra_app_info_settings"









        android:title="@string/extra_app_info_label"









        android:summary="@string/extra_app_info_summary"









        settings:controller="com.android.settings.applications.appinfo.ExtraAppInfoPreferenceController" />



















    <Preference









        android:key="time_spent_in_app"









        android:title="@string/time_spent_in_app_pref_title"