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

Commit 5b64856b authored by Matt Pietal's avatar Matt Pietal
Browse files

Sharesheet - expand 4 direct share to 8 when possible 

When the user scrolls, expand or collapse the direct share targets
when more than 4 targets exist.  Move the caller row below the
direct share row and limit to 4 items.

Bug: 126565347
Test: atest ChooserActivityTest
Change-Id: Ibae2dc0522d9393f2022d699ee641a4f6d553974
parent b3193521

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

+329 −114

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class ResolverActivity extends Activity { 


    protected ResolveListAdapter mAdapter;

    private boolean mSafeForwardingMode;

    private AbsListView mAdapterView;

    protected AbsListView mAdapterView;

    private Button mAlwaysButton;

    private Button mOnceButton;

    private Button mSettingsButton;

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ public class ResolverDrawerLayout extends ViewGroup { 
                        new LogMaker(MetricsEvent.ACTION_SHARESHEET_COLLAPSED_CHANGED)

                        .setSubtype(isCollapsedNew ? 1 : 0));

            }

            onScrollChanged(0, (int) newPos, 0, (int) (newPos - dy));

            postInvalidateOnAnimation();

            return dy;

        }

core/res/res/layout/chooser_row_direct_share.xml

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

<!--

/*

** Copyright 2019, 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:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="200dp">



</LinearLayout>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2770,6 +2770,7 @@ 
  <java-symbol type="drawable" name="scroll_indicator_material" />



  <java-symbol type="layout" name="chooser_row" />

  <java-symbol type="layout" name="chooser_row_direct_share" />

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

  <java-symbol type="bool" name="config_supportDoubleTapWake" />

  <java-symbol type="drawable" name="ic_perm_device_info" />