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

Commit 4dab445b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "DocumentsUi : Drm lock icon can be shown on documnets picker view."

parents b6c4d3ff 8ef02920

packages/DocumentsUI/res/drawable/ic_doc_drm.xml

+2 −3
Original line number Diff line number Diff line
@@ -28,6 +28,5 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-->



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

    android:src="@drawable/ic_doc_drm_am_alpha"

    android:tint="@*android:color/secondary_text_material_light"

    android:autoMirrored="true" />
 
    android:src="@drawable/ic_doc_drm_am_alpha" />

packages/DocumentsUI/res/values-es-rUS/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -55,4 +55,8 @@ 
    <string name="toast_no_application" msgid="1339885974067891667">"No se puede abrir el archivo."</string>

    <string name="toast_failed_delete" msgid="2180678019407244069">"No es posible eliminar algunos documentos."</string>

    <string name="share_via" msgid="8966594246261344259">"Compartir mediante"</string>

    <string name="no_permission_for_drm">Los archivos DRM no pueden compartirse.</string>

    <string name="drm_license_info">Información de licencia Drm</string>

    <string name="action_consumes_rights">Se agotarán los derechos para reproducir este multimedia.</string>

    <string name="rights_expired">Los derechos expiraron para esta canción.</string>

</resources>

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

+9 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.os.OperationCanceledException; 
import android.os.Parcelable;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.text.format.Formatter;

import android.text.format.Time;
@@ -88,6 +89,7 @@ import java.util.List; 




import android.content.ContentValues;

import android.drm.DrmHelper;

import android.drm.DrmManagerClient;

import android.drm.DrmStore.DrmDeliveryType;

import android.drm.DrmStore.RightsStatus;
@@ -853,11 +855,16 @@ public class DirectoryFragment extends Fragment { 
                if (docIcon != 0) {

                    iconMime.setImageDrawable(

                            IconUtils.loadPackageIcon(context, docAuthority, docIcon));

                } else {

                    if (DrmHelper.isDrmFile(docDisplayName)) {

                        iconMime.setImageDrawable(context

                                .getDrawable(R.drawable.ic_doc_drm));

                    } else {

                        iconMime.setImageDrawable(IconUtils.loadMimeIcon(

                                context, docMimeType, docAuthority, docId, state.derivedMode));

                    }

                }

            }



            boolean hasLine1 = false;

            boolean hasLine2 = false;