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

Commit 25f9e326 authored by Jason Monk's avatar Jason Monk
Browse files

Handle no peeking in app info pages 

Bug: 20496400
Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
parent 28c3ba15

res/layout/manage_applications_item.xml

+3 −1
Original line number Diff line number Diff line
@@ -59,13 +59,15 @@ 
        android:duplicateParentState="true" />



    <TextView

        android:id="@+id/app_size"

        android:id="@+id/app_summary"

        android:layout_column="1"

        android:layout_row="1"

        android:layout_gravity="fill_horizontal|top"

        android:textAppearance="@android:style/TextAppearance.Material.Body1"

        android:textColor="?android:attr/textColorSecondary"

        android:textAlignment="viewStart"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:duplicateParentState="true" />



    <TextView

res/values/strings.xml

+11 −4
Original line number Diff line number Diff line
@@ -6423,11 +6423,16 @@ 
   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->

   <string name="notifications_disabled">Block</string>

   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->

   <string name="notifications_sensitive">Sensitive</string>

   <string name="notifications_sensitive">Sensitive content hidden</string>

   <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->

   <string name="notifications_priority">Priority</string>

   <!-- App notification summary with notifications priority and sensitive [CHAR LIMIT=40] -->

   <string name="notifications_priority_sensitive">Priority &amp; Sensitive</string>

   <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->

   <string name="notifications_no_peeking">No peeking</string>

   <!-- App notification summary with 2 items [CHAR LIMIT=15] -->

   <string name="notifications_two_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g></string>

   <!-- App notification summary with 3 items [CHAR LIMIT=15] -->

   <string name="notifications_three_items"><xliff:g id="notif_state" example="Priority">%1$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%2$s</xliff:g> / <xliff:g id="notif_state" example="Priority">%3$s</xliff:g></string>





   <!-- Permissions preference summary [CHAR LIMIT=40] -->

   <plurals name="permissions_summary">
@@ -6459,7 +6464,9 @@ 
    <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->

    <string name="filter_notif_priority_apps">Priority</string>

    <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->

    <string name="filter_notif_sensitive_apps">Sensitive</string>

    <string name="filter_notif_sensitive_apps">Sensitive content hidden</string>

    <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->

    <string name="filter_notif_no_peeking">No peeking</string>

    <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->

    <string name="filter_with_domain_urls_apps">With domain URLs</string>

src/com/android/settings/applications/AppOpsDetails.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class AppOpsDetails extends InstrumentedFragment { 
        TextView label = (TextView) appSnippet.findViewById(R.id.app_name);

        label.setText(mPm.getApplicationLabel(pkgInfo.applicationInfo));

        // Version number of application

        mAppVersion = (TextView) appSnippet.findViewById(R.id.app_size);

        mAppVersion = (TextView) appSnippet.findViewById(R.id.app_summary);



        if (pkgInfo.versionName != null) {

            mAppVersion.setVisibility(View.VISIBLE);

src/com/android/settings/applications/AppStateNotificationBridge.java

+11 −0
Original line number Diff line number Diff line
@@ -87,4 +87,15 @@ public class AppStateNotificationBridge extends AppStateBaseBridge { 
            return info.extraInfo != null && ((AppRow) info.extraInfo).sensitive;

        }

    };



    public static final AppFilter FILTER_APP_NOTIFICATION_NO_PEEK = new AppFilter() {

        @Override

        public void init() {

        }



        @Override

        public boolean filterApp(AppEntry info) {

            return info.extraInfo != null && !((AppRow) info.extraInfo).peekable;

        }

    };

}

src/com/android/settings/applications/AppViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class AppViewHolder { 
            holder.rootView = convertView;

            holder.appName = (TextView) convertView.findViewById(R.id.app_name);

            holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon);

            holder.summary = (TextView) convertView.findViewById(R.id.app_size);

            holder.summary = (TextView) convertView.findViewById(R.id.app_summary);

            holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled);

            holder.checkBox = (CheckBox) convertView.findViewById(R.id.app_on_sdcard);

            convertView.setTag(holder);