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

Commit fb142abe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Authentication UI Prompt."

parents 418bce11 42b83bfe

res/color/item_root_primary_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_focused="true" android:state_activated="true" android:color="@color/root_activated_color" />

  <item android:state_focused="false" android:state_activated="true" android:color="@color/root_activated_color" />

    <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@color/root_title_color" />

    <item android:state_enabled="false" android:alpha="0.5" android:color="@color/root_title_color" />

    <item android:color="@color/root_title_color" />

</selector>

res/layout/item_doc_header_message.xml

+10 −23
Original line number Diff line number Diff line
@@ -13,26 +13,21 @@ 
     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:animateLayoutChanges="true"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="vertical"

    android:paddingLeft="@dimen/list_item_padding"

    android:paddingRight="@dimen/list_item_padding"

    android:paddingTop="@dimen/list_item_padding">



    <LinearLayout

    android:orientation="horizontal"

    android:id="@+id/message_container"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:orientation="horizontal">

    android:paddingLeft="@dimen/header_message_horizontal_padding"

    android:paddingRight="@dimen/header_message_horizontal_padding">



        <FrameLayout

            android:layout_height="@dimen/icon_size"

            android:layout_width="@dimen/icon_size">

            android:layout_width="@dimen/icon_size"

            android:layout_gravity="center_vertical"

            >



            <ImageView

                android:contentDescription="@null"
@@ -47,24 +42,16 @@ 
            android:id="@+id/message_textview"

            android:layout_gravity="center_vertical"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:selectAllOnFocus="true"/>



    </LinearLayout>



    <LinearLayout

        android:layout_gravity="right"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:orientation="horizontal">



        <Button

            android:id="@+id/button_dismiss"

            android:layout_gravity="end"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:text="@string/button_dismiss"

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



</LinearLayout>
 


</LinearLayout>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -56,4 +56,6 @@ 


    <dimen name="drop_icon_height">14dp</dimen>

    <dimen name="drop_icon_width">14dp</dimen>



    <dimen name="header_message_horizontal_padding">8dp</dimen>

</resources>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -303,4 +303,10 @@ 


    <!-- Error message displayed in rename dialog when there is a conflict with an existing file. -->

    <string name="name_conflict">A file with this name already exists.</string>



    <!-- Error message shown when more authentication is necessary to view files  -->

    <string name="authentication_required">Authentification is required to see the content of this directory</string>



    <!-- Text shown on button to open an application -->

    <string name="open_app">Open <xliff:g id="name" example="Cloud Storage">%1$s</xliff:g></string>

</resources>

src/com/android/documentsui/DirectoryLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { 
        } catch (Exception e) {

            Log.w(TAG, "Failed to query", e);

            result.exception = e;

            ContentProviderClient.releaseQuietly(client);

        } finally {

            synchronized (this) {

                mSignal = null;

            }

            ContentProviderClient.releaseQuietly(client);

        }



        return result;