Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Casey
2021-06-30 15:16:32 +00:00
committed by Android (Google) Code Review
parent 00b883001e 92991b7ef0
commit e68668899b
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/screenshot_save_background.xml → packages/SystemUI/res/drawable/screenshot_button_background.xml
View File

@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ 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" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:color="?android:textColorPrimary"> android:color="?android:textColorPrimary">

17
packages/SystemUI/res/layout/long_screenshot.xml
View File

@@ -32,12 +32,27 @@
android:text="@string/save" android:text="@string/save"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:background="@drawable/screenshot_save_background" android:background="@drawable/screenshot_button_background"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/preview" /> 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 <ImageButton
android:id="@+id/share" android:id="@+id/share"
style="@android:style/Widget.Material.Button.Borderless" style="@android:style/Widget.Material.Button.Borderless"

2
packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
View File

@@ -126,6 +126,8 @@ public class LongScreenshotActivity extends Activity {
mTransitionView = requireViewById(R.id.transition); mTransitionView = requireViewById(R.id.transition);
mEnterTransitionView = requireViewById(R.id.enter_transition); mEnterTransitionView = requireViewById(R.id.enter_transition);
requireViewById(R.id.cancel).setOnClickListener(v -> finishAndRemoveTask());
mSave.setOnClickListener(this::onClicked); mSave.setOnClickListener(this::onClicked);
mEdit.setOnClickListener(this::onClicked); mEdit.setOnClickListener(this::onClicked);
mShare.setOnClickListener(this::onClicked); mShare.setOnClickListener(this::onClicked);