Merge "Sharesheet - add label loading placeholder" into qt-dev

diff --cc core/java/com/android/internal/app/ChooserActivity.java
Simple merge

diff --cc core/res/res/values/dimens.xml
index f2ac755,0b3ad59..167e672
--- 1/core/res/res/values/dimens.xml
--- 2/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@@ -729,6 -734,6 +729,7 @@@
      <dimen name="resolver_icon_size">42dp</dimen>
      <dimen name="resolver_badge_size">18dp</dimen>
      <dimen name="chooser_target_width">90dp</dimen>
 +    <dimen name="chooser_header_scroll_elevation">4dp</dimen>
      <dimen name="chooser_max_collapsed_height">288dp</dimen>
+     <dimen name="chooser_direct_share_label_placeholder_max_width">72dp</dimen>
  </resources>

diff --cc core/res/res/values/symbols.xml
Simple merge