ash/resources/ash_resources.grd - Issue 2271523002: Adds emoji/handwriting/vocie buttons on opt-in IME menu.

Side by Side Diff: ash/resources/ash_resources.grd

Issue 2271523002: Adds emoji/handwriting/vocie buttons on opt-in IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('K') | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/resources/default_100_percent/cros/status/status_keyboard_emoji.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">	2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">

3 <outputs>	3 <outputs>

4 <output filename="grit/ash_resources.h" type="rc_header" context="default_10 0_percent">	4 <output filename="grit/ash_resources.h" type="rc_header" context="default_10 0_percent">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" />	7 <output filename="ash_resources_100_percent.pak" type="data_package" context ="default_100_percent" />

8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" />	8 <output filename="ash_resources_200_percent.pak" type="data_package" context ="default_200_percent" />

9 </outputs>	9 </outputs>

10 <release seq="1">	10 <release seq="1">

(...skipping 145 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
156 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" />	156 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_RECORDING _RED" file="cros/status/status_recording_red.png" />

157 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />	157 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SETTINGS" file="cros/status/status_settings.png" />

158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="cros/status/status_sms.png" />	158 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file ="cros/status/status_sms.png" />

159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMI SS" file="cros/status/status_sms_dismiss.png" />	159 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMI SS" file="cros/status/status_sms_dismiss.png" />

160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" />	160 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" />

161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" />	161 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VIRTUAL_K EYBOARD" file="cros/status/status_virtual_keyboard.png" />

162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" />	162 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED" file="cros/network/status_wifi_disabled.png" />

163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" />	163 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_DISA BLED_HOVER" file="cros/network/status_wifi_disabled_hover.png" />

164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" />	164 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED" file="cros/network/status_wifi_enabled.png" />

165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" />	165 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_WIFI_ENAB LED_HOVER" file="cros/network/status_wifi_enabled_hover.png" />

	166 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_EMOJI" fi le="cros/status/status_keyboard_emoji.png" />

	167 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_HANDWRITI NG" file="cros/status/status_keyboard_handwriting.png" />

	168 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOICE" fi le="cros/status/status_keyboard_voice.png" />

166 </if>	169 </if>

167	170

168	171

169 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" fil e="cros/status/status_update.png" />	172 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" fil e="cros/status/status_update.png" />

170 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREE N" file="cros/status/status_update_green.png" />	173 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_GREE N" file="cros/status/status_update_green.png" />

171 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORAN GE" file="cros/status/status_update_orange.png" />	174 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_ORAN GE" file="cros/status/status_update_orange.png" />

172 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_RED" file="cros/status/status_update_red.png" />	175 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_RED" file="cros/status/status_update_red.png" />

173 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK " file="cros/status/status_update_dark.png" />	176 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK " file="cros/status/status_update_dark.png" />

174 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _GREEN" file="cros/status/status_update_dark_green.png" />	177 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _GREEN" file="cros/status/status_update_dark_green.png" />

175 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _ORANGE" file="cros/status/status_update_dark_orange.png" />	178 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _ORANGE" file="cros/status/status_update_dark_orange.png" />

176 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _RED" file="cros/status/status_update_dark_red.png" />	179 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE_DARK _RED" file="cros/status/status_update_dark_red.png" />

177	180

178 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVE LS" file="cros/status/status_volume_dark.png" />	181 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_LEVE LS" file="cros/status/status_volume_dark.png" />

179 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE " file="cros/status/status_volume_mute.png" />	182 <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_VOLUME_MUTE " file="cros/status/status_volume_mute.png" />

180	183

181 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />	184 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />

182 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />	185 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />

183 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />	186 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />

184 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />	187 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_I NACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />

185	188

186 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" />	189 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE " file="common/window_overview_close_normal.png" />

187 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" />	190 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _H" file="common/window_overview_close_hover.png" />

188 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" />	191 <structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_OVERVIEW_CLOSE _P" file="common/window_overview_close_pressed.png" />

189	192

190 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />	193 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER" file="cros/ avatar_holder.png" />

191 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />	194 <structure type="chrome_scaled_image" name="IDR_AVATAR_HOLDER_MASK" file=" cros/avatar_holder_mask.png" />

192 </structures>	195 </structures>

193 </release>	196 </release>

194 </grit>	197 </grit>

OLD	NEW