Skip to content

GitLab

T
tangled
Commit 79072421 authored by Himanshu Jaju's avatar Himanshu Jaju Committed by Commit Bot
Browse files
Options

Zero state for shared clipboard 

Adds illustration to educate user on how to use devices
with shared clipboard. Button to open chrome settings page
to turn on sync would be a follow up CL.

Dark mode - https://drive.google.com/open?id=1bgNYKQIAppVpqDfknpntFderdEzcLkYL
Light mode - https://drive.google.com/open?id=106EBilI5KGzpdpPzLgrQUccmgwpFAT5s

Bug: 1001102
Change-Id: I48815dc1822657125ca7538b6ab69c3fa8b38886
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790202Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Reviewed-by: default avatarAlex Chau <alexchau@chromium.org>
Reviewed-by: default avatarMichael van Ouwerkerk <mvanouwerkerk@chromium.org>
Commit-Queue: Himanshu Jaju <himanshujaju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695201}
parent 977f0279
Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 15 deletions
chrome/android/java/res/drawable/shared_clipboard_zero_state_dark.xml 0 → 100644
View file @ 79072421
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2019 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:targetApi="21"
tools:ignore="VectorRaster"
android:width="412dp"
android:height="129dp"
android:viewportWidth="412"
android:viewportHeight="129">
<path
android:pathData="M358.064,-6.508L45.311,-6.508C40.761,-6.508 37.071,-2.818 37.071,1.732L37.071,86.055L366.304,86.055L366.304,1.732C366.304,-2.818 362.614,-6.508 358.064,-6.508Z"
android:strokeWidth="1"
android:fillColor="#F8F9FA"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M427,-6.508l-460.925,0l-0,121.025l460.925,0z"
android:strokeWidth="1"
android:fillColor="#202124"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M148.9,95.729L148.9,104.445C153.828,106.017 159.328,107.063 165.265,107.088C180.692,107.155 195.369,100.337 208.885,86.826L203.081,81.024C191.195,92.907 178.51,98.917 165.38,98.886C159.338,98.871 153.765,97.568 148.9,95.729Z"
android:strokeWidth="1"
android:fillColor="#3C4043"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M101.889,18.427L98.068,18.427C92.386,18.427 87.779,23.032 87.779,28.712C87.779,66.248 87.779,90.996 87.779,102.955"
android:strokeLineJoin="round"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#5F6368"
android:fillType="evenOdd"
android:strokeLineCap="round"/>
<path
android:pathData="M87.746,110.99L87.746,117.171C87.746,122.851 92.352,127.455 98.035,127.455L106.004,127.455M87.746,110.99L87.746,117.171C87.746,122.851 92.352,127.455 98.035,127.455L106.004,127.455"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:fillType="nonZero"
android:strokeColor="#F6AEA9"
android:strokeLineCap="round"/>
<path
android:pathData="M115.989,18.427L138.928,18.427C144.61,18.427 149.216,23.032 149.216,28.712L149.216,117.161C149.216,122.841 144.61,127.446 138.928,127.446L118.843,127.446M115.989,18.427L138.928,18.427C144.61,18.427 149.216,23.032 149.216,28.712L149.216,117.161C149.216,122.841 144.61,127.446 138.928,127.446L118.843,127.446"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:fillType="nonZero"
android:strokeColor="#5F6368"
android:strokeLineCap="round"/>
<path
android:pathData="M362.548,35.911C365.746,35.911 368.361,38.476 368.361,41.61L368.361,121.403L246.271,121.403L246.271,41.61C246.271,38.476 248.887,35.911 252.085,35.911L362.548,35.911Z"
android:strokeWidth="1.03"
android:fillColor="#202124"
android:strokeColor="#5F6368"
android:fillType="evenOdd"/>
<path
android:pathData="M392.599,127.446L222.712,127.446"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#5F6368"
android:fillType="evenOdd"
android:strokeLineCap="square"/>
<path
android:pathData="M135.455,26.655C138.504,26.655 140.985,29.126 140.985,32.164L140.985,113.709C140.985,116.747 138.504,119.218 135.455,119.218L101.245,119.218C98.196,119.218 95.716,116.747 95.716,113.709L95.716,32.164C95.716,29.126 98.196,26.655 101.245,26.655L135.455,26.655Z"
android:strokeWidth="1.03"
android:fillColor="#202124"
android:strokeColor="#5F6368"
android:fillType="evenOdd"/>
<path
android:pathData="M281.278,82.653L287.082,76.851C286.673,76.443 276.902,66.801 261.631,62.48C247.42,58.461 225.701,58.444 202.934,81.203L208.738,87.003C224.756,70.991 241.8,65.397 259.396,70.375C272.632,74.118 281.193,82.567 281.278,82.653"
android:strokeWidth="1"
android:fillColor="#8AB4F8"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M74.097,11.471C74.443,12.779 74.88,13.701 75.425,14.245C76.047,14.868 77.276,15.454 79.135,16.031C77.573,16.431 76.431,16.987 75.705,17.713C74.978,18.438 74.422,19.581 74.022,21.143C73.445,19.284 72.858,18.055 72.236,17.433C71.691,16.888 70.769,16.451 69.461,16.105C70.832,15.714 71.849,15.191 72.515,14.525C73.182,13.859 73.705,12.841 74.097,11.471Z"
android:strokeWidth="1.03"
android:fillColor="#FDD663"
android:strokeColor="#FDD663"
android:fillType="evenOdd"/>
<path
android:pathData="M240.821,22.761C241.303,24.849 241.93,26.284 242.726,27.079C243.605,27.958 245.442,28.796 248.267,29.624C245.868,30.163 244.147,30.946 243.102,31.991C242.056,33.036 241.273,34.756 240.734,37.155C239.905,34.331 239.067,32.494 238.188,31.615C237.393,30.82 235.958,30.193 233.869,29.712C236.024,29.178 237.588,28.431 238.564,27.455C239.54,26.48 240.287,24.916 240.821,22.761Z"
android:strokeWidth="1.03"
android:fillColor="#FDD663"
android:strokeColor="#FDD663"
android:fillType="evenOdd"/>
<path
android:pathData="M225.569,16.478C225.797,17.182 226.074,17.698 226.409,18.034C226.814,18.438 227.548,18.815 228.627,19.182C227.737,19.459 227.064,19.821 226.608,20.278C226.15,20.735 225.788,21.408 225.511,22.298C225.144,21.219 224.767,20.485 224.362,20.08C224.026,19.745 223.51,19.468 222.806,19.24C223.565,18.976 224.15,18.642 224.56,18.232C224.97,17.822 225.304,17.237 225.569,16.478Z"
android:strokeWidth="1.03"
android:fillColor="#FDD663"
android:strokeColor="#FDD663"
android:fillType="evenOdd"/>
<path
android:pathData="M58.104,5.672C58.332,6.376 58.609,6.893 58.944,7.228C59.349,7.633 60.083,8.01 61.162,8.377C60.272,8.654 59.599,9.016 59.143,9.473C58.685,9.929 58.323,10.602 58.046,11.492C57.679,10.413 57.302,9.679 56.897,9.274C56.561,8.939 56.045,8.662 55.341,8.434C56.1,8.17 56.685,7.836 57.095,7.426C57.505,7.016 57.839,6.432 58.104,5.672Z"
android:strokeWidth="1.03"
android:fillColor="#FDD663"
android:strokeColor="#FDD663"
android:fillType="evenOdd"/>
<path
android:pathData="M62.778,58.238C62.96,58.739 63.177,59.117 63.436,59.376C63.76,59.699 64.318,60 65.124,60.29C64.468,60.518 63.961,60.807 63.604,61.165C63.246,61.522 62.957,62.028 62.729,62.685C62.438,61.879 62.138,61.321 61.814,60.997C61.555,60.739 61.178,60.521 60.676,60.339C61.229,60.124 61.664,59.861 61.982,59.543C62.299,59.226 62.563,58.791 62.778,58.238Z"
android:strokeWidth="1.03"
android:fillColor="#FDD663"
android:strokeColor="#FDD663"
android:fillType="evenOdd"/>
<path
android:pathData="M22.168,50.515L44.542,50.515L56.098,50.515L66.908,50.515C66.535,44.879 61.829,40.407 56.098,40.407C54.884,40.407 53.671,40.618 52.491,41.037L52.009,41.206L51.688,40.809C48.514,36.884 43.803,34.631 38.764,34.631C29.847,34.631 22.547,41.692 22.168,50.515Z"
android:strokeWidth="1.03"
android:fillColor="#292A2D"
android:strokeColor="#5F6368"
android:fillType="evenOdd"/>
<path
android:pathData="M-25.878,104.659L-3.504,104.659L8.052,104.659L18.862,104.659C18.489,99.023 13.783,94.551 8.052,94.551C6.838,94.551 5.625,94.762 4.445,95.18L3.964,95.35L3.643,94.953C0.469,91.027 -4.242,88.775 -9.282,88.775C-18.199,88.775 -25.498,95.835 -25.878,104.659Z"
android:strokeWidth="1.03"
android:fillColor="#292A2D"
android:strokeColor="#5F6368"
android:fillType="evenOdd"/>
<path
android:pathData="M392.599,127.446L222.712,127.446"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#5F6368"
android:fillType="evenOdd"
android:strokeLineCap="square"/>
<path
android:pathData="M135.452,26.653C138.501,26.653 140.982,29.124 140.982,32.162L140.982,113.707C140.982,116.745 138.501,119.216 135.452,119.216L101.242,119.216C98.192,119.216 95.712,116.745 95.712,113.707L95.712,32.162C95.712,29.124 98.192,26.653 101.242,26.653L135.452,26.653Z"
android:strokeWidth="1.03"
android:fillColor="#202124"
android:strokeColor="#5F6368"
android:fillType="evenOdd"/>
<group>
<clip-path android:pathData="M123.794,75.9C123.031,75.9 122.346,76.199 121.834,76.682L115.017,72.713C115.065,72.491 115.104,72.269 115.104,72.037C115.104,71.806 115.065,71.584 115.017,71.362L121.824,67.393C122.336,67.876 123.031,68.175 123.794,68.175C125.397,68.175 126.691,66.881 126.691,65.278C126.691,63.675 125.397,62.381 123.794,62.381C122.191,62.381 120.897,63.675 120.897,65.278C120.897,65.51 120.936,65.742 120.984,65.954L114.177,69.923C113.655,69.44 112.97,69.141 112.207,69.141C110.604,69.141 109.31,70.435 109.31,72.037C109.31,73.64 110.604,74.934 112.207,74.934C112.97,74.934 113.655,74.635 114.177,74.152L120.984,78.131C120.936,78.343 120.897,78.565 120.897,78.797C120.897,80.4 122.191,81.694 123.794,81.694C125.397,81.694 126.691,80.4 126.691,78.797C126.691,77.194 125.397,75.9 123.794,75.9ZM123.794,64.312C124.325,64.312 124.76,64.747 124.76,65.278C124.76,65.809 124.325,66.244 123.794,66.244C123.263,66.244 122.829,65.809 122.829,65.278C122.829,64.747 123.263,64.312 123.794,64.312ZM112.207,73.003C111.676,73.003 111.241,72.569 111.241,72.037C111.241,71.506 111.676,71.072 112.207,71.072C112.738,71.072 113.172,71.506 113.172,72.037C113.172,72.569 112.738,73.003 112.207,73.003ZM123.794,79.763C123.263,79.763 122.829,79.328 122.829,78.797C122.829,78.266 123.263,77.831 123.794,77.831C124.325,77.831 124.76,78.266 124.76,78.797C124.76,79.328 124.325,79.763 123.794,79.763Z M 0,0"/>
<path
android:pathData="M106.413,60.45h23.175v23.175h-23.175z"
android:strokeWidth="1"
android:fillColor="#5F6368"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</group>
</vector>
chrome/android/java/res/drawable/shared_clipboard_zero_state_light.xml 0 → 100644
View file @ 79072421
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2019 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:targetApi="21"
tools:ignore="VectorRaster"
android:width="412dp"
android:height="129dp"
android:viewportWidth="412"
android:viewportHeight="129">
<path
android:pathData="M0,-6.508h460.925v121.025h-460.925z"
android:strokeWidth="1"
android:fillColor="#F8F9FA"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M149.35,95.785L149.35,104.501C154.279,106.074 159.781,107.121 165.72,107.146C181.147,107.213 195.823,100.395 209.339,86.884L203.536,81.082C191.649,92.965 178.965,98.974 165.835,98.944C159.791,98.929 154.216,97.625 149.35,95.785Z"
android:strokeWidth="1"
android:fillColor="#E8E9EB"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M102.339,18.49L98.518,18.49C92.836,18.49 88.229,23.094 88.229,28.774C88.229,66.31 88.229,91.058 88.229,103.017"
android:strokeLineJoin="round"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#BDC0C5"
android:fillType="evenOdd"
android:strokeLineCap="round"/>
<path
android:pathData="M88.196,111.053L88.196,117.233C88.196,122.913 92.802,127.518 98.485,127.518L106.454,127.518M88.196,111.053L88.196,117.233C88.196,122.913 92.802,127.518 98.485,127.518L106.454,127.518"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:fillType="nonZero"
android:strokeColor="#E54440"
android:strokeLineCap="round"/>
<path
android:pathData="M116.439,18.49L139.378,18.49C145.06,18.49 149.666,23.094 149.666,28.774L149.666,117.223C149.666,122.904 145.06,127.508 139.378,127.508L119.293,127.508M116.439,18.49L139.378,18.49C145.06,18.49 149.666,23.094 149.666,28.774L149.666,117.223C149.666,122.904 145.06,127.508 139.378,127.508L119.293,127.508"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:fillType="nonZero"
android:strokeColor="#BDC0C5"
android:strokeLineCap="round"/>
<path
android:pathData="M252.535,35.974L362.998,35.974C366.196,35.974 368.811,38.538 368.811,41.673L368.811,121.466L246.721,121.466L246.721,41.673C246.721,38.538 249.337,35.974 252.535,35.974"
android:strokeWidth="1.03"
android:fillColor="#F4F4F4"
android:strokeColor="#BDC0C5"
android:fillType="evenOdd"/>
<path
android:pathData="M393.049,127.508L223.162,127.508"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#BDC0C5"
android:fillType="evenOdd"
android:strokeLineCap="square"/>
<path
android:pathData="M135.905,26.718C138.954,26.718 141.435,29.189 141.435,32.226L141.435,113.772C141.435,116.809 138.954,119.28 135.905,119.28L101.695,119.28C98.646,119.28 96.166,116.809 96.166,113.772L96.166,32.226C96.166,29.189 98.646,26.718 101.695,26.718L135.905,26.718Z"
android:strokeWidth="1.03"
android:fillColor="#F4F4F4"
android:strokeColor="#E8E9EB"
android:fillType="evenOdd"/>
<path
android:pathData="M281.728,82.715L287.532,76.914C287.123,76.505 277.352,66.863 262.081,62.543C247.87,58.523 226.151,58.507 203.384,81.265L209.188,87.066C225.206,71.053 242.25,65.459 259.846,70.437C273.082,74.181 281.643,82.63 281.728,82.715"
android:strokeWidth="1"
android:fillColor="#4285F4"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M74.547,11.533C74.893,12.842 75.33,13.763 75.875,14.308C76.497,14.93 77.726,15.517 79.585,16.093C78.023,16.493 76.881,17.049 76.155,17.775C75.428,18.501 74.872,19.643 74.472,21.205C73.895,19.347 73.308,18.118 72.686,17.495C72.141,16.951 71.219,16.514 69.911,16.168C71.282,15.777 72.299,15.254 72.965,14.588C73.632,13.921 74.155,12.904 74.547,11.533Z"
android:strokeWidth="1.03"
android:fillColor="#FBBC06"
android:strokeColor="#FBBC06"
android:fillType="evenOdd"/>
<path
android:pathData="M241.271,22.824C241.753,24.912 242.38,26.347 243.176,27.142C244.055,28.021 245.892,28.858 248.717,29.686C246.318,30.226 244.597,31.008 243.552,32.053C242.506,33.098 241.723,34.819 241.184,37.218C240.355,34.393 239.517,32.556 238.638,31.677C237.843,30.882 236.408,30.255 234.319,29.774C236.474,29.24 238.038,28.493 239.014,27.518C239.99,26.542 240.737,24.979 241.271,22.824Z"
android:strokeWidth="1.03"
android:fillColor="#FBBC06"
android:strokeColor="#FBBC06"
android:fillType="evenOdd"/>
<path
android:pathData="M226.019,16.54C226.247,17.244 226.524,17.761 226.859,18.096C227.264,18.501 227.998,18.878 229.077,19.245C228.187,19.522 227.514,19.884 227.058,20.341C226.6,20.798 226.238,21.47 225.961,22.36C225.594,21.281 225.217,20.547 224.812,20.142C224.476,19.807 223.96,19.53 223.256,19.303C224.015,19.038 224.6,18.704 225.01,18.294C225.42,17.884 225.754,17.3 226.019,16.54Z"
android:strokeWidth="1.03"
android:fillColor="#FBBC06"
android:strokeColor="#FBBC06"
android:fillType="evenOdd"/>
<path
android:pathData="M58.554,5.735C58.782,6.439 59.059,6.955 59.394,7.291C59.799,7.695 60.533,8.072 61.612,8.439C60.722,8.716 60.049,9.078 59.593,9.535C59.135,9.992 58.773,10.665 58.496,11.555C58.129,10.476 57.752,9.742 57.347,9.337C57.011,9.002 56.495,8.725 55.791,8.497C56.55,8.233 57.135,7.899 57.545,7.489C57.955,7.078 58.289,6.494 58.554,5.735Z"
android:strokeWidth="1.03"
android:fillColor="#FBBC06"
android:strokeColor="#FBBC06"
android:fillType="evenOdd"/>
<path
android:pathData="M63.227,58.301C63.41,58.802 63.627,59.18 63.886,59.438C64.21,59.762 64.768,60.062 65.574,60.353C64.918,60.581 64.411,60.87 64.054,61.227C63.696,61.585 63.407,62.091 63.179,62.748C62.888,61.942 62.588,61.383 62.264,61.059C62.005,60.801 61.628,60.584 61.126,60.401C61.679,60.187 62.114,59.923 62.432,59.606C62.749,59.289 63.013,58.854 63.227,58.301Z"
android:strokeWidth="1.03"
android:fillColor="#FBBC06"
android:strokeColor="#FBBC06"
android:fillType="evenOdd"/>
<path
android:pathData="M22.617,50.578L44.992,50.578L56.548,50.578L67.358,50.578C66.985,44.942 62.279,40.47 56.548,40.47C55.334,40.47 54.121,40.681 52.941,41.099L52.459,41.269L52.138,40.872C48.964,36.946 44.253,34.694 39.214,34.694C30.297,34.694 22.997,41.754 22.617,50.578Z"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#E8E9EB"
android:fillType="evenOdd"/>
<path
android:pathData="M-25.428,104.721L-3.054,104.721L8.502,104.721L19.312,104.721C18.939,99.085 14.233,94.613 8.502,94.613C7.288,94.613 6.075,94.824 4.895,95.243L4.414,95.413L4.093,95.016C0.919,91.09 -3.792,88.838 -8.832,88.838C-17.749,88.838 -25.048,95.898 -25.428,104.721Z"
android:strokeWidth="1.03"
android:fillColor="#00000000"
android:strokeColor="#E8E9EB"
android:fillType="evenOdd"/>
<group>
<clip-path android:pathData="M124.243,75.963C123.48,75.963 122.795,76.261 122.283,76.744L115.466,72.775C115.514,72.553 115.553,72.331 115.553,72.1C115.553,71.868 115.514,71.646 115.466,71.424L122.273,67.455C122.785,67.938 123.48,68.238 124.243,68.238C125.846,68.238 127.14,66.944 127.14,65.34C127.14,63.737 125.846,62.444 124.243,62.444C122.64,62.444 121.346,63.737 121.346,65.34C121.346,65.573 121.385,65.805 121.433,66.017L114.626,69.986C114.104,69.503 113.419,69.203 112.656,69.203C111.053,69.203 109.759,70.497 109.759,72.1C109.759,73.702 111.053,74.996 112.656,74.996C113.419,74.996 114.104,74.698 114.626,74.215L121.433,78.193C121.385,78.406 121.346,78.628 121.346,78.859C121.346,80.463 122.64,81.757 124.243,81.757C125.846,81.757 127.14,80.463 127.14,78.859C127.14,77.257 125.846,75.963 124.243,75.963ZM124.243,64.375C124.774,64.375 125.209,64.81 125.209,65.34C125.209,65.871 124.774,66.307 124.243,66.307C123.712,66.307 123.278,65.871 123.278,65.34C123.278,64.81 123.712,64.375 124.243,64.375ZM112.656,73.065C112.125,73.065 111.69,72.632 111.69,72.1C111.69,71.568 112.125,71.134 112.656,71.134C113.188,71.134 113.621,71.568 113.621,72.1C113.621,72.632 113.188,73.065 112.656,73.065ZM124.243,79.826C123.712,79.826 123.278,79.391 123.278,78.859C123.278,78.328 123.712,77.894 124.243,77.894C124.774,77.894 125.209,78.328 125.209,78.859C125.209,79.391 124.774,79.826 124.243,79.826Z M 0,0"/>
<path
android:pathData="M106.862,60.513h23.175v23.175h-23.175z"
android:strokeWidth="1"
android:fillColor="#BDC0C5"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</group>
</vector>
chrome/android/java/res/layout/sharing_device_picker.xml
View file @ 79072421
......@@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/sheet_bg_color">
<TextView
android:id="@+id/device_picker_toolbar"
android:layout_width="match_parent"
......@@ -31,26 +32,56 @@
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.BlackHint1" />
android:visibility="gone"
android:textAppearance="@style/TextAppearance.BlackToolbarTitle"
android:text="@string/send_tab_to_self_sheet_toolbar" />
<ListView
android:id="@+id/device_picker_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@null"/>
android:divider="@null" />
<TextView
android:id="@android:id/empty"
<LinearLayout
android:id="@+id/empty_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/empty_state_image"
android:layout_height="wrap_content"
android:layout_width ="match_parent"
android:gravity="center_vertical"
android:contentDescription="@string/sharing_no_devices_available_text"
android:src="@drawable/shared_clipboard_zero_state"/>
<TextView
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:text="@string/sharing_device_list_empty"/>
android:textAppearance="@style/TextAppearance.BlackToolbarTitle"
android:text="@string/sharing_no_devices_available_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingTop="16dp"
android:paddingBottom="32dp"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.BlackHint1"
android:text="@string/sharing_no_devices_available_text"/>
<!-- TODO(himanshujaju) - Add a hidden button which is visible when sync isn't enabled -->
</LinearLayout>
</LinearLayout>
......
chrome/android/java/res/values/drawables.xml
View file @ 79072421
......@@ -12,4 +12,5 @@
<drawable name="ic_play_circle_filled_24dp">
@drawable/ic_play_circle_filled_24dp_on_light_bg
</drawable>
<drawable name="shared_clipboard_zero_state">@drawable/shared_clipboard_zero_state_light</drawable>
</resources>
\ No newline at end of file
chrome/android/java/res_night/values-night/drawables.xml
View file @ 79072421
......@@ -14,4 +14,5 @@
<drawable name="password_manager_onboarding_illustration01">@drawable/password_manager_onboarding_illustration01_dark_mode</drawable>
<drawable name="password_manager_onboarding_illustration02">@drawable/password_manager_onboarding_illustration02_dark_mode</drawable>
<drawable name="password_manager_onboarding_illustration03">@drawable/password_manager_onboarding_illustration03_dark_mode</drawable>
<drawable name="shared_clipboard_zero_state">@drawable/shared_clipboard_zero_state_dark</drawable>
</resources>
\ No newline at end of file
chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
View file @ 79072421
......@@ -13,7 +13,6 @@ import android.view.animation.AnimationUtils;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView;
import android.widget.TextView;
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
......@@ -73,13 +72,10 @@ public class SharedClipboardShareActivity
View mask = findViewById(R.id.mask);
mask.setOnClickListener(v -> finish());
TextView toolbarText = findViewById(R.id.device_picker_toolbar);
toolbarText.setText(R.string.send_tab_to_self_sheet_toolbar);
mListView = findViewById(R.id.device_picker_list);
mListView.setAdapter(mAdapter);
mListView.setOnItemClickListener(this);
mListView.setEmptyView(findViewById(android.R.id.empty));
mListView.setEmptyView(findViewById(R.id.empty_state));
View content = findViewById(R.id.device_picker_content);
content.startAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_up));
......@@ -98,6 +94,10 @@ public class SharedClipboardShareActivity
super.finishNativeInitialization();
mAdapter = new SharingAdapter(SharingDeviceCapability.SHARED_CLIPBOARD);
if (!mAdapter.isEmpty()) {
findViewById(R.id.device_picker_toolbar).setVisibility(View.VISIBLE);
}
mListView.setAdapter(mAdapter);
}
......
chrome/android/java/strings/android_chrome_strings.grd
View file @ 79072421
......@@ -3884,8 +3884,11 @@ The site does NOT gain access to the camera. The camera images are only visible
<message name="IDS_SHARING_DISMISS_ACTION" desc="Text for action that dismiss a sharing sending notification.">
Dismiss
</message>
<message name="IDS_SHARING_DEVICE_LIST_EMPTY" desc="Text to shown when no device targets are available for sharing.">
No devices available.
<message name="IDS_SHARING_NO_DEVICES_AVAILABLE_TITLE" desc="Text to show when no device targets are available for sharing.">
Turn on sync to share across devices
</message>
<message name="IDS_SHARING_NO_DEVICES_AVAILABLE_TEXT" desc="Text to show when no device targets are available for sharing.">
To share something from your phone to another device, turn on sync in Chrome settings on both devices
</message>
<!-- ClickToCall -->
......
ui/android/java/res/values-v17/styles.xml
View file @ 79072421
......@@ -160,6 +160,11 @@
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.BlackToolbarTitle" tools:ignore="UnusedResources">
<item name="android:textColor">@color/default_text_color_secondary_list</item>
<item name="android:textSize">@dimen/text_size_large</item>
<item name="android:textStyle">bold</item>
</style>
<!-- White Text Styles -->
<style name="TextAppearance.WhiteHeadline" tools:ignore="UnusedResources">
......
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