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

Commit b6f2f39d authored by Trevor Black's avatar Trevor Black Committed by Android (Google) Code Review
Browse files

Merge "Update Android Settings for the latest Extra App Info design" into sc-dev

parents cc28a082 7c5484bc

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -13276,6 +13276,8 @@ 








    <!-- 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>

















    <!-- Title for toggle controlling whether notifications are shown when an app pastes from clipboard. [CHAR LIMIT=50] -->









    <string name="show_clip_access_notification">Show clipboard access</string>

























res/xml/app_info_settings_v2.xml



+1
−0






























Original line number
Diff line number
Diff line







@@ -83,6 +83,7 @@







    <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
































src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java



+5
−0






























Original line number
Diff line number
Diff line







@@ -34,4 +34,9 @@ public interface ExtraAppInfoFeatureProvider {







     * Sets the package name









     */









    void setPackageName(String packageName);



















    /**









     * gets the summary name









     */









    String getSummary(Context context);









}
























src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java



+5
−0






























Original line number
Diff line number
Diff line







@@ -37,4 +37,9 @@ public class ExtraAppInfoFeatureProviderImpl implements







    public void setPackageName(String packageName) {









        return;









    }



















    @Override









    public String getSummary(Context context) {









        return "";









    }









}
























src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java



+5
−0






























Original line number
Diff line number
Diff line







@@ -50,6 +50,11 @@ public class ExtraAppInfoPreferenceController extends BasePreferenceController {







        return super.handlePreferenceTreeClick(preference);









    }



















    @Override









    public CharSequence getSummary() {









        return mExtraAppInfoFeatureProvider.getSummary(mContext);









    }



















    /**









     * Set the local package name









     */