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

Commit 2d2b24f0 authored by Nick Chameyev's avatar Nick Chameyev
Browse files

[Partial Screensharing] Update app selector (ChooserActivity) header 

Updates title style (increases font size), adds an icon
and hides the drag handle for media projection app
selector activity which is based on ChooserActivity.

Bug: 235465652
Test: atest com.android.internal.app.ChooserActivityTest
Test: screenshot test in a follow-up CL
Change-Id: Ib717d3f7e6132d56e8344f4e06a12a64ee63457b
parent 4cce97fd

core/java/com/android/internal/app/ChooserActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -1619,6 +1619,8 @@ public class ChooserActivity extends ResolverActivity implements 
        if (mChooserMultiProfilePagerAdapter.getInactiveListAdapter() != null) {

            mChooserMultiProfilePagerAdapter.getInactiveListAdapter().destroyAppPredictor();

        }

        mPersonalAppPredictor = null;

        mWorkAppPredictor = null;

    }



    @Override // ResolverListCommunicator

core/res/res/values/symbols.xml

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
  <java-symbol type="id" name="deny_button" />

  <java-symbol type="id" name="description" />

  <java-symbol type="id" name="divider" />

  <java-symbol type="id" name="drag" />

  <java-symbol type="id" name="profile_pager" />

  <java-symbol type="id" name="chooser_header" />

  <java-symbol type="id" name="content_preview_container" />

  <java-symbol type="id" name="profile_tabhost" />

  <java-symbol type="id" name="edit_query" />

  <java-symbol type="id" name="edittext_container" />

  <java-symbol type="id" name="expand_activities_button" />

packages/SystemUI/res/drawable/ic_present_to_all.xml

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

  ~ Copyright (C) 2022 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"

     android:tint="?attr/colorControlNormal">

     <path

         android:fillColor="@android:color/white"

         android:pathData="M21,3L3,3c-1.11,0 -2,0.89 -2,2v14c0,1.11 0.89,2 2,2h18c1.11,0 2,-0.89 2,-2L23,5c0,-1.11 -0.89,-2 -2,-2zM21,19.02L3,19.02L3,4.98h18v14.04zM8,12l4,-4 4,4 -1.41,1.41L13,11.83L13,16h-2v-4.17l-1.59,1.59L8,12z"/>

 </vector>

packages/SystemUI/res/layout/media_projection_app_selector.xml

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

<!--

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

  -->

<com.android.internal.widget.ResolverDrawerLayout

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    androidprv:maxCollapsedHeight="0dp"

    androidprv:maxCollapsedHeightSmall="56dp"

    androidprv:maxWidth="@*android:dimen/chooser_width"

    android:id="@*android:id/contentPanel">



    <LinearLayout

        android:id="@*android:id/chooser_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        androidprv:layout_alwaysShow="true"

        android:gravity="center"

        android:elevation="0dp"

        android:background="@*android:drawable/bottomsheet_background">



        <ImageView

            android:id="@*android:id/icon"

            android:layout_width="@dimen/media_projection_app_selector_icon_size"

            android:layout_height="@dimen/media_projection_app_selector_icon_size"

            android:layout_marginTop="@*android:dimen/chooser_edge_margin_normal"

            android:layout_marginBottom="@*android:dimen/chooser_edge_margin_normal"

            android:importantForAccessibility="no"

            android:tint="?android:attr/textColorPrimary"/>



        <TextView android:id="@*android:id/title"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

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

            android:gravity="center"

            android:paddingBottom="@*android:dimen/chooser_view_spacing"

            android:paddingLeft="24dp"

            android:paddingRight="24dp"/>

    </LinearLayout>



    <FrameLayout

        android:id="@*android:id/content_preview_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone" />



    <TabHost

        android:id="@*android:id/profile_tabhost"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_centerHorizontal="true"

        android:background="?android:attr/colorBackground">

        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content">

            <TabWidget

                android:id="@*android:id/tabs"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone">

            </TabWidget>

            <FrameLayout

                android:id="@*android:id/tabcontent"

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

                <com.android.internal.app.ResolverViewPager

                    android:id="@*android:id/profile_pager"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"/>

            </FrameLayout>

        </LinearLayout>

    </TabHost>



</com.android.internal.widget.ResolverDrawerLayout>

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,8 @@ 


    <dimen name="fgs_manager_list_top_spacing">12dp</dimen>



    <dimen name="media_projection_app_selector_icon_size">32dp</dimen>



    <!-- Dream overlay related dimensions -->

    <dimen name="dream_overlay_status_bar_height">60dp</dimen>

    <dimen name="dream_overlay_status_bar_margin">40dp</dimen>