diff options
author | Alison Cichowlas <asc@google.com> | 2021-06-24 20:19:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-24 20:19:45 +0000 |
commit | cf49f78265fe1043d8d58bd863a95cfe94e50f72 (patch) | |
tree | fc7136e76b16de0e2861f60160aea3943b2b8b26 | |
parent | 394b3b6ee916527309f7633df226f4f434a87f39 (diff) | |
parent | c9f528479d17db032ce8bf259b3d46446d484cdb (diff) |
Merge "Direct share load cutback - minimal/low-risk version." into sc-dev
-rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 4 | ||||
-rw-r--r-- | core/res/res/drawable/chooser_direct_share_icon_placeholder.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 08db74f5e351..7000ed75d5be 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -464,8 +464,8 @@ public class ChooserActivity extends ResolverActivity implements private static final int SHORTCUT_MANAGER_SHARE_TARGET_RESULT_COMPLETED = 5; private static final int LIST_VIEW_UPDATE_MESSAGE = 6; - private static final int WATCHDOG_TIMEOUT_MAX_MILLIS = 10000; - private static final int WATCHDOG_TIMEOUT_MIN_MILLIS = 3000; + private static final int WATCHDOG_TIMEOUT_MAX_MILLIS = 1000; + private static final int WATCHDOG_TIMEOUT_MIN_MILLIS = 300; private boolean mMinTimeoutPassed = false; diff --git a/core/res/res/drawable/chooser_direct_share_icon_placeholder.xml b/core/res/res/drawable/chooser_direct_share_icon_placeholder.xml index 838cb49ca79e..bd8dba866dd2 100644 --- a/core/res/res/drawable/chooser_direct_share_icon_placeholder.xml +++ b/core/res/res/drawable/chooser_direct_share_icon_placeholder.xml @@ -26,7 +26,7 @@ <group android:name="background"> <path android:pathData="M0,0 L 64,0 64,64 0,64 z" - android:fillColor="@color/chooser_gradient_background"/> + android:fillColor="@android:color/transparent"/> </group> <!-- Gradient starts offscreen so it is not visible in the first frame before start --> @@ -44,7 +44,7 @@ android:color="@android:color/transparent" android:offset="0.0" /> <item - android:color="@color/chooser_gradient_highlight" + android:color="@android:color/transparent" android:offset="0.5" /> <item android:color="@android:color/transparent" @@ -58,7 +58,7 @@ shadow. Using clip-path is a more elegant solution but leaves awful jaggies around the path's shape. --> <group android:name="cover"> - <path android:fillColor="?attr/colorBackgroundFloating" + <path android:fillColor="@android:color/transparent" android:pathData="M0,0 L64,0 L64,64 L0,64 L0,0 Z M59.0587325,42.453601 C60.3124932,39.2104785 61,35.6855272 61,32 C61,15.9837423 48.0162577,3 32,3 C15.9837423,3 3,15.9837423 3,32 C3,48.0162577 15.9837423,61 32,61 C35.6855272,61 39.2104785,60.3124932 42.453601,59.0587325 C44.3362195,60.2864794 46.5847839,61 49,61 C55.627417,61 61,55.627417 61,49 C61,46.5847839 60.2864794,44.3362195 59.0587325,42.453601 Z"/> </group> </vector> |