Merge "[DocsUI M3] Update empty state illustrations" into main (94130d12) · Commits · e / os / android_packages_apps_DocumentsUI

res/flag(com.android.documentsui.flags.use_material3)/drawable/empty_m3.xml

+28 −34

Original line number	Diff line number	Diff line
		@@ -14,38 +14,32 @@ Copyright (C) 2024 The Android Open Source Project
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="210dp"
		android:height="210dp"
		android:viewportWidth="210"
		android:viewportHeight="210">

		<path
		android:fillColor="#DADCE0"
		android:pathData="M115,109.44H95c-1.1,0-2-0.9-2-2s0.9-2,2-2h20c1.1,0,2,0.9,2,2S116.1,109.44,115,109.44z" />
		<path
		android:fillColor="#DADCE0"
		android:pathData="M62.67,85.14l3-0.11L62.67,85.14c-0.04-0.74-0.06-1.48-0.06-2.22c0-0.69,0.02-1.37,0.05-2.05l5.99,0.29 c-0.03,0.58-0.04,1.17-0.04,1.76c0,0.64,0.02,1.28,0.05,1.92l-2.99,0.2L62.67,85.14z" />
		<path
		android:fillColor="#DADCE0"
		android:pathData="M147.35,84.94l-5.99-0.28c0.03-0.56,0.04-1.12,0.04-1.69c0-0.64-0.02-1.28-0.05-1.92l-0.01-0.13l5.99-0.3 l0,0.08c0.04,0.77,0.06,1.52,0.06,2.26C147.39,83.64,147.38,84.29,147.35,84.94z" />
		<path
		android:fillColor="#EA4335"
		android:pathData="M72.56,66.45l-5.35-2.72c0.65-1.28,1.38-2.54,2.16-3.75l5.04,3.25C73.74,64.27,73.12,65.35,72.56,66.45z" />
		<path
		android:fillColor="#EA4335"
		android:pathData="M137.35,66.27c-0.56-1.09-1.19-2.17-1.87-3.21l5.02-3.28c0.79,1.21,1.52,2.46,2.18,3.74L137.35,66.27z" />
		<path
		android:fillColor="#DADCE0"
		android:pathData="M85.15,52.44l-3.28-5.03c1.2-0.79,2.46-1.52,3.74-2.18l2.75,5.33C87.26,51.14,86.18,51.77,85.15,52.44z" />
		<path
		android:fillColor="#DADCE0"
		android:pathData="M124.69,52.34c-1.04-0.67-2.12-1.29-3.22-1.85l2.72-5.35c1.28,0.65,2.54,1.38,3.75,2.15L124.69,52.34z" />
		<path
		android:fillColor="#EA4335"
		android:pathData="M103.12,46.61l-0.4-5.99l0.08,0c1.45-0.07,2.85-0.08,4.25-0.01l-0.28,5.99 C105.56,46.54,104.34,46.54,103.12,46.61z" />
		<path
		android:fillColor="#DADCE0"
		android:pathData="M154,95.44v70H56v-70H154 M154,91.44H56c-2.21,0-4,1.79-4,4v70c0,2.21,1.79,4,4,4h98c2.21,0,4-1.79,4-4 v-70C158,93.24,156.21,91.44,154,91.44L154,91.44z" />
		<path
		android:pathData="M 0 0 H 210 V 210 H 0 V 0 Z" />
		android:width="200dp"
		android:height="200dp"
		android:viewportWidth="200"
		android:viewportHeight="200">
		<path
		android:pathData="M53.82,139.86C51.9,139.86 50.22,139.14 48.78,137.7C47.34,136.18 46.62,134.5 46.62,132.65V70.21C46.62,68.36 47.34,66.72 48.78,65.28C50.22,63.76 51.9,63 53.82,63H84.57C85.53,63 86.45,63.2 87.33,63.6C88.29,64 89.09,64.52 89.73,65.16L94.78,70.21H135.49C137.33,70.21 138.97,70.97 140.41,72.49C141.93,73.93 142.69,75.57 142.69,77.41V132.65C142.69,134.5 141.93,136.18 140.41,137.7C138.97,139.14 137.33,139.86 135.49,139.86H53.82Z"
		android:fillColor="?attr/colorPrimaryInverse"/>
		<path
		android:pathData="M156.01,85C161.8,85 165.67,90.95 163.33,96.24L146.81,133.56C145.08,137.47 141.2,140 136.92,140H53.01L53.01,139.99C51.42,139.94 49.97,138.97 49,138C50.91,138.48 53.75,138.05 54.87,135.79L74.44,91.45C76.17,87.53 80.05,85 84.33,85H156.01Z"
		android:fillColor="?attr/colorPrimaryContainer"/>
		<path
		android:pathData="M161.61,61.13L154.55,68.24"
		android:strokeWidth="4"
		android:fillColor="#00000000"
		android:strokeColor="?attr/colorPrimary"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M145.96,51.01L145.99,61.03"
		android:strokeWidth="4"
		android:fillColor="#00000000"
		android:strokeColor="?attr/colorPrimary"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M170.04,76.33L160.02,76.36"
		android:strokeWidth="4"
		android:fillColor="#00000000"
		android:strokeColor="?attr/colorPrimary"
		android:strokeLineCap="round"/>
		</vector>
		No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/empty_search.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2025 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="200dp"
		android:height="200dp"
		android:viewportWidth="200"
		android:viewportHeight="200">
		<path
		android:pathData="M92.07,53.07C70.14,55.59 54.4,75.35 56.93,97.21C59.46,119.07 79.29,134.75 101.22,132.23C123.16,129.71 138.89,109.94 136.36,88.08C133.83,66.22 114,50.55 92.07,53.07ZM53.15,97.65C50.38,73.7 67.61,52.05 91.63,49.29C115.66,46.53 137.38,63.7 140.15,87.65C142.92,111.6 125.69,133.24 101.66,136C77.64,138.76 55.92,121.59 53.15,97.65Z"
		android:strokeWidth="4"
		android:fillColor="?attr/colorOutline"
		android:fillType="evenOdd"
		android:strokeColor="?attr/colorOutline"/>
		<path
		android:pathData="M128.57,119.57L165.03,153.91L166.49,155.29L165.11,156.74L162.49,159.51L161.12,160.95L159.67,159.58L123.21,125.25L121.75,123.87L123.13,122.42L125.74,119.65L127.11,118.21L128.57,119.57Z"
		android:fillColor="?attr/colorOutline"/>
		<path
		android:pathData="M91.4,47.31C116.52,44.42 139.24,62.37 142.13,87.42C143.65,100.54 139.43,112.99 131.46,122.29L165.03,153.91L166.49,155.29L165.11,156.74L162.49,159.5L161.12,160.95L159.67,159.58L125.89,127.77C119.28,133.25 111.06,136.94 101.89,137.99C76.77,140.88 54.06,122.92 51.16,97.88C48.26,72.83 66.29,50.19 91.4,47.31ZM134.37,88.31C131.97,67.56 113.14,52.66 92.3,55.05C71.46,57.45 56.52,76.22 58.92,96.98L59.04,97.95C61.91,118.2 80.48,132.6 101,130.24C121.51,127.89 136.31,109.65 134.47,89.29L134.37,88.31Z"
		android:fillColor="?attr/colorOutline"/>
		<path
		android:pathData="M168.48,161.91C164.48,166.21 157.65,166.14 153.74,161.75L132.39,137.76L141.61,127.77L167.21,147.18C171.91,150.74 172.51,157.59 168.48,161.91V161.91Z"
		android:fillColor="?attr/colorOnSurfaceVariant"
		android:fillType="evenOdd"/>
		<path
		android:pathData="M97.91,101.39C96.7,101.68 95.6,101.56 94.62,101.04C93.64,100.52 93.03,99.81 92.81,98.89L92.72,98.51C92.34,96.92 92.37,95.45 92.82,94.1C93.28,92.73 94.31,91.03 95.9,89.01C97.27,87.2 98.16,85.8 98.56,84.8C98.99,83.79 99.08,82.77 98.83,81.74C98.47,80.25 97.74,79.21 96.63,78.61C95.52,78.02 94.12,77.93 92.41,78.34C91.48,78.56 90.68,78.91 89.99,79.39C89.31,79.87 88.76,80.49 88.33,81.24C87.9,81.98 87.57,82.67 87.32,83.32C87.1,83.94 86.62,84.49 85.9,84.95C85.18,85.4 84.31,85.57 83.28,85.46C82.25,85.35 81.39,84.89 80.71,84.06C80.03,83.24 79.73,82.26 79.81,81.12C79.91,79.97 80.43,78.64 81.37,77.15C82.33,75.66 83.62,74.36 85.24,73.26C86.88,72.15 88.84,71.32 91.12,70.77C95.2,69.78 98.75,70.03 101.77,71.51C104.81,72.96 106.74,75.4 107.56,78.81C108.02,80.72 107.95,82.65 107.35,84.6C106.75,86.53 105.56,88.61 103.79,90.82C102.74,92.13 102.03,93.23 101.67,94.14C101.29,95.03 101.2,96.04 101.39,97.17L101.43,97.32C101.5,98.12 101.23,98.93 100.63,99.75C100.04,100.54 99.14,101.09 97.91,101.39ZM101.34,115.09C99.74,115.48 98.25,115.28 96.89,114.5C95.55,113.71 94.69,112.55 94.32,111.02C93.96,109.51 94.2,108.1 95.04,106.81C95.89,105.49 97.12,104.63 98.73,104.25C100.33,103.86 101.82,104.06 103.18,104.84C104.54,105.61 105.4,106.75 105.76,108.26C106.13,109.79 105.89,111.21 105.03,112.53C104.18,113.85 102.95,114.71 101.34,115.09Z"
		android:fillColor="?attr/colorPrimary"/>
		<path
		android:pathData="M34.2,20.71C35.18,20.08 36.36,19.85 37.5,20.07C38.64,20.3 39.65,20.96 40.31,21.92L40.45,22.14L41.28,23.55C41.65,24.2 42.18,24.74 42.82,25.12C43.46,25.5 44.19,25.71 44.94,25.72L46.53,25.77C47.7,25.81 48.8,26.32 49.6,27.17C50.4,28.02 50.83,29.15 50.79,30.32C50.77,30.4 50.77,30.49 50.8,30.57L50.62,32.19C50.54,32.93 50.65,33.67 50.94,34.35C51.23,35.03 51.69,35.62 52.28,36.07L53.52,37.11C54.43,37.83 55.02,38.89 55.16,40.04C55.3,41.19 54.98,42.35 54.27,43.27C54.19,43.32 54.17,43.44 54.09,43.49L53.06,44.66C52.55,45.2 52.2,45.87 52.03,46.59C51.87,47.31 51.89,48.07 52.11,48.78L52.51,50.33C52.82,51.46 52.67,52.66 52.1,53.67C51.52,54.69 50.57,55.44 49.44,55.76C49.37,55.8 49.25,55.77 49.17,55.82L47.61,56.17C46.89,56.32 46.21,56.65 45.66,57.14C45.1,57.63 44.67,58.25 44.42,58.94L43.88,60.48C43.46,61.57 42.64,62.45 41.58,62.93C40.52,63.42 39.31,63.47 38.22,63.08C38.13,63.07 38.05,63.03 37.99,62.96L36.58,62.32C35.9,62.04 35.16,61.92 34.42,61.99C33.68,62.05 32.97,62.29 32.34,62.69L31.01,63.55C30.04,64.18 28.85,64.41 27.71,64.19C26.57,63.96 25.56,63.3 24.91,62.34L24.77,62.12L23.93,60.72C23.56,60.07 23.02,59.53 22.37,59.16C21.72,58.78 20.98,58.58 20.23,58.58L18.64,58.54C17.47,58.49 16.37,57.99 15.57,57.14C14.77,56.28 14.34,55.15 14.37,53.99C14.4,53.9 14.4,53.81 14.37,53.73L14.55,52.11C14.63,51.37 14.52,50.63 14.23,49.95C13.94,49.27 13.48,48.68 12.89,48.22L11.64,47.24C11.18,46.88 10.8,46.43 10.51,45.92C10.22,45.41 10.04,44.85 9.97,44.27C9.91,43.69 9.95,43.1 10.11,42.54C10.27,41.98 10.54,41.45 10.91,41C10.98,40.95 11.01,40.83 11.09,40.78L12.13,39.56C12.64,39.01 12.99,38.35 13.15,37.62C13.32,36.9 13.29,36.15 13.08,35.44L12.68,33.88C12.37,32.75 12.52,31.55 13.1,30.54C13.67,29.53 14.62,28.78 15.75,28.46C15.82,28.41 15.94,28.44 16.02,28.4L17.58,28.04C18.3,27.89 18.98,27.56 19.54,27.07C20.1,26.58 20.52,25.96 20.77,25.26L21.31,23.74C21.73,22.65 22.55,21.77 23.61,21.28C24.67,20.8 25.88,20.75 26.97,21.14C27.06,21.15 27.14,21.19 27.2,21.26L28.65,21.9C29.33,22.19 30.08,22.3 30.81,22.24C31.55,22.17 32.26,21.93 32.89,21.54L34.2,20.71Z"
		android:fillColor="?attr/colorPrimaryContainer"/>
		<path
		android:pathData="M167.88,41.39L171.27,43.3C172.89,44.21 174.75,44.64 176.61,44.54L180.49,44.33C188.2,43.9 193.32,52.14 189.53,58.83L187.61,62.2C186.69,63.82 186.26,65.67 186.36,67.53L186.58,71.4C187,79.07 178.74,84.18 172.03,80.4L168.64,78.49C167.02,77.58 165.16,77.14 163.3,77.25L159.42,77.46C151.71,77.88 146.59,69.65 150.38,62.96L152.3,59.58C153.22,57.97 153.65,56.12 153.55,54.26L153.34,50.39C152.91,42.71 161.17,37.6 167.88,41.39Z"
		android:fillColor="?attr/colorPrimaryContainer"/>
		<path
		android:pathData="M50.37,136.4L37.97,141.2C36.7,141.69 35.59,142.51 34.74,143.57C33.89,144.62 33.33,145.88 33.12,147.22L31.07,160.31C30.86,161.65 31.01,163.02 31.5,164.28C31.99,165.54 32.8,166.65 33.86,167.5L44.22,175.79C45.27,176.64 46.53,177.2 47.87,177.41C49.21,177.61 50.59,177.46 51.85,176.97L64.26,172.16C65.52,171.67 66.64,170.86 67.49,169.8C68.34,168.75 68.9,167.49 69.11,166.15L71.15,153.05C71.36,151.71 71.21,150.35 70.72,149.08C70.23,147.82 69.42,146.71 68.36,145.87L58.01,137.57C56.95,136.72 55.69,136.17 54.35,135.96C53.01,135.76 51.64,135.9 50.37,136.4Z"
		android:fillColor="?attr/colorPrimaryContainer"/>
		<group>
		<clip-path
		android:pathData="M16.33,33.08l25.37,-6.71l6.71,25.37l-25.37,6.71z"/>
		<path
		android:pathData="M27.37,53.66C26.8,53.81 26.27,53.73 25.75,53.43C25.24,53.14 24.91,52.71 24.76,52.14L20.82,37.24C20.67,36.67 20.75,36.14 21.04,35.62C21.34,35.11 21.77,34.78 22.34,34.63L37.24,30.69C37.8,30.54 38.34,30.62 38.85,30.91C39.37,31.21 39.7,31.64 39.85,32.21L43.79,47.11C43.94,47.67 43.86,48.21 43.56,48.72C43.27,49.24 42.83,49.57 42.27,49.72L27.37,53.66ZM28.39,48.86L39.01,46.05C39.22,46 39.36,45.87 39.42,45.66C39.47,45.44 39.41,45.26 39.22,45.12L35.25,41.99C35.11,41.88 34.95,41.84 34.77,41.89C34.61,41.93 34.5,42.04 34.43,42.21L32.64,46.66L29.96,44.55C29.82,44.43 29.66,44.4 29.48,44.45C29.32,44.49 29.21,44.59 29.14,44.76L27.75,48.16C27.66,48.37 27.69,48.56 27.84,48.73C28,48.87 28.18,48.92 28.39,48.86Z"
		android:fillColor="?attr/colorOnPrimaryContainer"/>
		</group>
		<group>
		<clip-path
		android:pathData="M34.54,148.28l24.82,-8.51l8.51,24.82l-24.82,8.51z"/>
		<path
		android:pathData="M52.25,166.49C51.08,166.89 49.93,166.82 48.8,166.28C47.68,165.72 46.92,164.85 46.52,163.68C46.13,162.53 46.2,161.39 46.74,160.28C47.3,159.15 48.16,158.38 49.34,157.98C49.71,157.85 50.07,157.77 50.41,157.75C50.75,157.73 51.1,157.76 51.45,157.83L48.05,147.9C47.94,147.57 47.95,147.26 48.1,146.96C48.25,146.66 48.49,146.45 48.81,146.34L53.11,144.87C53.43,144.76 53.75,144.77 54.05,144.92C54.35,145.07 54.56,145.31 54.67,145.63L55.37,147.68C55.48,148 55.46,148.32 55.32,148.62C55.17,148.92 54.93,149.13 54.6,149.24L51.45,150.32L55.03,160.77C55.43,161.94 55.36,163.09 54.82,164.22C54.28,165.33 53.42,166.08 52.25,166.49Z"
		android:fillColor="?attr/colorOnPrimaryContainer"/>
		</group>
		<group>
		<clip-path
		android:pathData="M160.51,44.97l25.4,6.57l-6.57,25.4l-25.4,-6.57z"/>
		<path
		android:pathData="M166.52,60.9L172.93,62.56C173.23,62.64 173.5,62.6 173.74,62.46C173.99,62.32 174.15,62.1 174.23,61.8C174.3,61.5 174.27,61.22 174.13,60.98C173.98,60.74 173.76,60.57 173.46,60.5L167.06,58.84C166.76,58.76 166.49,58.79 166.24,58.94C166,59.08 165.84,59.3 165.76,59.6C165.68,59.9 165.71,60.18 165.86,60.42C166,60.66 166.22,60.83 166.52,60.9ZM165.7,64.08L172.1,65.74C172.4,65.81 172.68,65.78 172.92,65.64C173.16,65.49 173.33,65.27 173.4,64.97C173.48,64.67 173.45,64.4 173.3,64.15C173.16,63.91 172.94,63.75 172.64,63.67L166.24,62.01C165.93,61.94 165.66,61.97 165.42,62.11C165.18,62.26 165.01,62.48 164.94,62.78C164.86,63.08 164.89,63.35 165.04,63.6C165.18,63.84 165.4,64 165.7,64.08ZM164.88,67.25L168.11,68.09C168.41,68.17 168.68,68.13 168.92,67.99C169.17,67.85 169.33,67.62 169.41,67.32C169.48,67.02 169.45,66.75 169.31,66.51C169.16,66.26 168.94,66.1 168.64,66.03L165.41,65.19C165.11,65.11 164.84,65.15 164.6,65.29C164.35,65.43 164.19,65.66 164.12,65.96C164.04,66.25 164.07,66.53 164.21,66.77C164.36,67.02 164.58,67.18 164.88,67.25ZM160.84,69.65C160.28,69.51 159.85,69.18 159.54,68.67C159.24,68.16 159.17,67.62 159.31,67.06L163.72,50.01C163.87,49.45 164.2,49.02 164.71,48.72C165.22,48.42 165.76,48.34 166.32,48.48L174.05,50.48C174.31,50.55 174.55,50.67 174.77,50.84C175.01,51.02 175.19,51.22 175.32,51.46L179.1,57.89C179.25,58.12 179.35,58.38 179.38,58.67C179.43,58.94 179.41,59.21 179.34,59.48L176.25,71.44C176.1,72 175.77,72.44 175.26,72.74C174.75,73.04 174.21,73.11 173.65,72.97L160.84,69.65ZM172.23,56.73C172.16,57.02 172.19,57.29 172.33,57.55C172.48,57.79 172.7,57.96 173,58.03L177.23,59.13L173.33,52.5L172.23,56.73Z"
		android:fillColor="?attr/colorOnPrimaryContainer"/>
		</group>
		</vector>

res/flag(com.android.documentsui.flags.use_material3)/drawable/hourglass_m3.xml

+52 −127

File changed.

Preview size limit exceeded, changes collapsed.

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_directory_m3.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<!-- defaultFocusHighlightEnabled=false to prevent unexpected focus background when there
		is not item, do not use focusable=false because we still want it to be focused in
		TalkBack. -->
		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/dir_list"
		android:layout_width="match_parent"
		@@ -46,6 +49,7 @@
		android:clipToPadding="false"
		android:scrollbars="none"
		android:drawSelectorOnTop="true"
		android:defaultFocusHighlightEnabled="false"
		app:fastScrollEnabled="false"/>

		</com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout>

res/flag(com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_content_m3.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@
		android:id="@+id/artwork"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="25dp"
		android:layout_marginBottom="25dp"
		android:layout_marginTop="@dimen/empty_state_artwork_margin_top"
		android:layout_marginBottom="@dimen/empty_state_artwork_margin_bottom"
		android:scaleType="fitCenter"
		android:maxHeight="250dp"
		android:adjustViewBounds="true"
		@@ -38,7 +38,7 @@
		android:id="@+id/message"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="25dp"
		android:layout_marginBottom="@dimen/empty_state_message_margin_bottom"
		android:gravity="center_horizontal"
		style="@style/EmptyStateTitleTextM3"/>