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

Commit e6866889 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Add cancel button to long screenshot UI" into sc-dev

parents 00b88300 92991b7e

packages/SystemUI/res/drawable/screenshot_save_background.xml→packages/SystemUI/res/drawable/screenshot_button_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- Long screenshot save button background -->

<!-- Long screenshot save/cancel button background -->

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

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

        android:color="?android:textColorPrimary">

packages/SystemUI/res/layout/long_screenshot.xml

+16 −1
Original line number Diff line number Diff line
@@ -32,12 +32,27 @@ 
        android:text="@string/save"

        android:layout_marginStart="8dp"

        android:layout_marginTop="4dp"

        android:background="@drawable/screenshot_save_background"

        android:background="@drawable/screenshot_button_background"

        android:textColor="?android:textColorSecondary"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/preview" />



    <Button

        android:id="@+id/cancel"

        style="@android:style/Widget.DeviceDefault.Button.Colored"

        android:layout_width="wrap_content"

        android:layout_height="40dp"

        android:text="@android:string/cancel"

        android:layout_marginStart="6dp"

        android:layout_marginTop="4dp"

        android:background="@drawable/screenshot_button_background"

        android:textColor="?android:textColorSecondary"

        app:layout_constraintStart_toEndOf="@id/save"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toTopOf="@id/preview"

    />



    <ImageButton

        android:id="@+id/share"

        style="@android:style/Widget.Material.Button.Borderless"

packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ public class LongScreenshotActivity extends Activity { 
        mTransitionView = requireViewById(R.id.transition);

        mEnterTransitionView = requireViewById(R.id.enter_transition);



        requireViewById(R.id.cancel).setOnClickListener(v -> finishAndRemoveTask());



        mSave.setOnClickListener(this::onClicked);

        mEdit.setOnClickListener(this::onClicked);

        mShare.setOnClickListener(this::onClicked);