Commit 79420a7a authored by Richard Knoll's avatar Richard Knoll Committed by Commit Bot

Improve animations for shared clipboard device selection.

This replaces the default animation, slide-in from right to left, with a
custom one that slides in the device list only from the bottom. Also
used the correct background color instead of hardcoding white to support
dark theme.

Bug: 1001104, 1001550
Change-Id: Icffa16ea07250bf0f34ef1c8be2a5f6ff4b1db37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1789239Reviewed-by: default avatarAlex Chau <alexchau@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Alex Chau <alexchau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694807}
parent ec492b9a
...@@ -910,7 +910,7 @@ by a child template that "extends" this file. ...@@ -910,7 +910,7 @@ by a child template that "extends" this file.
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:noHistory="true" android:noHistory="true"
android:theme="@style/Theme.Chromium.Activity.Translucent" android:theme="@style/Theme.Chromium.Activity.TranslucentNoAnimations"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
......
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
android:label="@string/shared_clipboard_share_activity_title" android:label="@string/shared_clipboard_share_activity_title"
android:name="org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity" android:name="org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity"
android:noHistory="true" android:noHistory="true"
android:theme="@style/Theme.Chromium.Activity.Translucent"> android:theme="@style/Theme.Chromium.Activity.TranslucentNoAnimations">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND"/> <action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
......
...@@ -13,41 +13,45 @@ ...@@ -13,41 +13,45 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:alpha="0.5" android:background="@android:color/transparent" />
android:background="@android:color/black" />
<TextView <LinearLayout
android:id="@+id/device_picker_toolbar" android:id="@+id/device_picker_content"
android:layout_width="match_parent"
android:layout_height="@dimen/min_touch_target_size"
android:gravity="center_vertical"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.BlackHint1"
android:background="@android:color/white" />
<ListView
android:id="@+id/device_picker_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="@null" android:orientation="vertical"
android:background="@android:color/white"/> android:background="@color/sheet_bg_color">
<TextView
android:id="@+id/device_picker_toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/min_touch_target_size"
android:gravity="center_vertical"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.BlackHint1" />
<TextView <ListView
android:id="@android:id/empty" android:id="@+id/device_picker_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:divider="@null"/>
android:paddingStart="30dp"
android:paddingEnd="30dp" <TextView
android:paddingTop="16dp" android:id="@android:id/empty"
android:paddingBottom="8dp" android:layout_width="match_parent"
android:ellipsize="end" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.BlackHint1" android:gravity="center_vertical"
android:background="@android:color/white" android:paddingStart="30dp"
android:text="@string/sharing_device_list_empty"/> android:paddingEnd="30dp"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.BlackHint1"
android:text="@string/sharing_device_list_empty"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -125,6 +125,18 @@ ...@@ -125,6 +125,18 @@
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
</style> </style>
<style name="Theme.Chromium.Activity.TranslucentNoAnimations" parent="Theme.Chromium.Activity.Translucent">
<!-- Transparent status bar -->
<item name="android:statusBarColor" tools:targetApi="21">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<!-- Dim background -->
<item name="android:backgroundDimEnabled">true</item>
<!-- Disable default animations -->
<item name="android:windowEnterAnimation">@null</item>
<item name="android:windowExitAnimation">@null</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="Base.Theme.Chromium.Preferences" parent="Theme.Chromium.WithActionBar"> <style name="Base.Theme.Chromium.Preferences" parent="Theme.Chromium.WithActionBar">
<item name="android:spinnerItemStyle">@style/PreferenceSpinnerItem</item> <item name="android:spinnerItemStyle">@style/PreferenceSpinnerItem</item>
<item name="floatLabelTextAppearance">@style/TextAppearance.BlackCaption</item> <item name="floatLabelTextAppearance">@style/TextAppearance.BlackCaption</item>
......
...@@ -9,6 +9,7 @@ import android.content.Context; ...@@ -9,6 +9,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.view.View; import android.view.View;
import android.view.animation.AnimationUtils;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView; import android.widget.ListView;
...@@ -80,6 +81,9 @@ public class SharedClipboardShareActivity ...@@ -80,6 +81,9 @@ public class SharedClipboardShareActivity
mListView.setOnItemClickListener(this); mListView.setOnItemClickListener(this);
mListView.setEmptyView(findViewById(android.R.id.empty)); mListView.setEmptyView(findViewById(android.R.id.empty));
View content = findViewById(R.id.device_picker_content);
content.startAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_up));
onInitialLayoutInflationComplete(); onInitialLayoutInflationComplete();
} }
...@@ -109,11 +113,4 @@ public class SharedClipboardShareActivity ...@@ -109,11 +113,4 @@ public class SharedClipboardShareActivity
device.guid, device.clientName, getIntent().getStringExtra(Intent.EXTRA_TEXT)); device.guid, device.clientName, getIntent().getStringExtra(Intent.EXTRA_TEXT));
finish(); finish();
} }
@Override
public void finish() {
super.finish();
// TODO(alexchau): Handle animations.
overridePendingTransition(R.anim.no_anim, R.anim.no_anim);
}
} }
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:noHistory="true" android:noHistory="true"
android:theme="@style/Theme.Chromium.Activity.Translucent" android:theme="@style/Theme.Chromium.Activity.TranslucentNoAnimations"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment