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

Commit 34810bc0 authored by Kelvin Kwan's avatar Kelvin Kwan
Browse files

Add error handling and UI on WP quiet mode / no permission to share 

Listen to WP on/off
When broadcast is received, update roots and then refresh the dir if needed.

If canShareAcrossProfile value changes in RootsFragment, refresh
the directory.

Add 2 new inflated message error screens
When WP is in quiet mode, show a button to turn on WP
MODIFY_QUIET_MODE(privileged) is required.

Bug: 148270816
Test: atest DocumentsUIGoogleTests
Test: manual - turning on/off WP > message shown/disappear
Test: manual - changing dpc policy > message shown/disappear
Change-Id: Icd307e503294aae4a8c7a9c3091facee7f6ec814
parent b7b46985

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />



    <!-- Permissions required for reading and logging compat changes -->

    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>

res/drawable/share_off.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:pathData="M19.7225,20.9245L21.2011,22.4031L22.4032,21.201L2.8022,1.6L1.6001,2.8021L8.1265,9.3284L7.64,9.612C7.1,9.112 6.39,8.802 5.6,8.802C3.94,8.802 2.6,10.142 2.6,11.802C2.6,13.462 3.94,14.802 5.6,14.802C6.39,14.802 7.1,14.492 7.64,13.992L14.69,18.112C14.64,18.332 14.6,18.562 14.6,18.802C14.6,20.462 15.94,21.802 17.6,21.802C18.43,21.802 19.18,21.467 19.7225,20.9245ZM16.8938,18.0958L18.3063,19.5083C18.125,19.6895 17.875,19.802 17.6,19.802C17.05,19.802 16.6,19.352 16.6,18.802C16.6,18.527 16.7125,18.277 16.8938,18.0958ZM15.1871,16.3891L9.3881,10.5901L8.51,11.102C8.56,11.332 8.6,11.562 8.6,11.802C8.6,12.042 8.56,12.272 8.51,12.502L15.1871,16.3891ZM15.56,6.992L12.4382,8.8119L11.1766,7.5503L14.69,5.502C14.64,5.282 14.6,5.042 14.6,4.802C14.6,3.142 15.94,1.802 17.6,1.802C19.26,1.802 20.6,3.142 20.6,4.802C20.6,6.462 19.26,7.802 17.6,7.802C16.81,7.802 16.09,7.492 15.56,6.992ZM18.6,4.802C18.6,4.252 18.15,3.802 17.6,3.802C17.05,3.802 16.6,4.252 16.6,4.802C16.6,5.352 17.05,5.802 17.6,5.802C18.15,5.802 18.6,5.352 18.6,4.802ZM5.6,12.802C5.05,12.802 4.6,12.352 4.6,11.802C4.6,11.252 5.05,10.802 5.6,10.802C6.15,10.802 6.6,11.252 6.6,11.802C6.6,12.352 6.15,12.802 5.6,12.802Z"

        android:fillType="evenOdd"

        android:fillColor="@color/error_image_color"/>

</vector>

res/drawable/work_off.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="@color/error_image_color"

        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v1.17L10.83,8L20,8v9.17l1.98,1.98c0,-0.05 0.02,-0.1 0.02,-0.16L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2zM19,19L8,8 6,6 2.81,2.81 1.39,4.22 3.3,6.13C2.54,6.41 2.01,7.14 2.01,8L2,19c0,1.11 0.89,2 2,2h14.17l1.61,1.61 1.41,-1.41 -0.37,-0.37L19,19zM4,19L4,8h1.17l11,11L4,19z"/>

</vector>

res/layout/item_doc_inflated_message.xml

+4 −27
Original line number Diff line number Diff line
@@ -22,30 +22,7 @@ 
    android:background="?android:attr/colorBackground"

    android:focusable="true">



    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/artwork"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="25dp"

            android:layout_marginBottom="25dp"

            android:scaleType="fitCenter"

            android:maxHeight="250dp"

            android:adjustViewBounds="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="25dp"

            android:gravity="center_horizontal"

            style="?android:attr/textAppearanceListItem"/>



    </LinearLayout>

    <include android:id="@+id/content" layout="@layout/item_doc_inflated_message_content"/>

    <include android:id="@+id/cross_profile"

             layout="@layout/item_doc_inflated_message_cross_profile"/>

</FrameLayout>

res/layout/item_doc_inflated_message_content.xml

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

<!--

  ~ Copyright (C) 2020 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/content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <ImageView

        android:id="@+id/artwork"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="25dp"

        android:layout_marginBottom="25dp"

        android:scaleType="fitCenter"

        android:maxHeight="250dp"

        android:adjustViewBounds="true"

        android:gravity="bottom|center_horizontal"

        android:contentDescription="@null"/>



    <TextView

        android:id="@+id/message"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="25dp"

        android:gravity="center_horizontal"

        style="?android:attr/textAppearanceListItem"/>



</LinearLayout>
 
 No newline at end of file