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

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

Merge "Add a new developer options screen for shared data." into rvc-dev

parents e646b28e 7efe9315

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1990,6 +1990,11 @@ 
                  android:label="Terms of Service"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />



        <activity android:name=".development.storage.BlobInfoListView"

                  android:label="@string/shared_data_title" />

        <activity android:name=".development.storage.LeaseInfoListView"

                  android:label="@string/accessor_info_title" />



        <activity android:name="Settings$WebViewAppPickerActivity"

                  android:label="@string/select_webview_provider_dialog_title" />

res/layout/blob_list_item_view.xml

0 → 100644
+50 −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:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

    android:orientation="vertical"

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

    android:padding="@dimen/list_preferred_item_padding">



    <TextView

        android:id="@+id/blob_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textDirection="locale"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:singleLine="true"

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



    <TextView

        android:id="@+id/blob_id"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

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



    <TextView

        android:id="@+id/blob_expiry"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

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

</LinearLayout>

res/layout/lease_list_item_view.xml

0 → 100644
+52 −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:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

    android:orientation="vertical"

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

    android:padding="@dimen/list_preferred_item_padding">



    <!-- TODO (varunshah@): add an image view for the app icon -->



    <TextView

        android:id="@+id/lease_package"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textDirection="locale"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:singleLine="true"

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



    <TextView

        android:id="@+id/lease_desc"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

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



    <TextView

        android:id="@+id/lease_expiry"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

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

</LinearLayout>

res/layout/shared_data_empty_list_view.xml

0 → 100644
+31 −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:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center"

    android:background="@android:color/transparent"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <TextView

        android:id="@+id/empty_view_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:textAppearance="?android:attr/textAppearanceLarge" />

</LinearLayout>

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -418,4 +418,7 @@ 
    <dimen name="developer_option_dialog_margin_top">8dp</dimen>

    <dimen name="developer_option_dialog_min_height">48dp</dimen>

    <dimen name="developer_option_dialog_padding_start">16dp</dimen>



    <!-- Developer options shared data screens related dimensions -->

    <dimen name="list_preferred_item_padding">16dp</dimen>

</resources>