OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/magnifier/magnification_controller.h" | 5 #include "ash/magnifier/magnification_controller.h" |
6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
7 #include "ash/system/tray/system_tray.h" | 7 #include "ash/system/tray/system_tray.h" |
8 #include "ash/system/tray_accessibility.h" | 8 #include "ash/system/tray_accessibility.h" |
9 #include "ash/system/user/login_status.h" | 9 #include "ash/system/user/login_status.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 } | 139 } |
140 | 140 |
141 void CloseDetailMenu() { | 141 void CloseDetailMenu() { |
142 CHECK(tray()->detailed_menu_); | 142 CHECK(tray()->detailed_menu_); |
143 tray()->DestroyDetailedView(); | 143 tray()->DestroyDetailedView(); |
144 tray()->detailed_menu_ = NULL; | 144 tray()->detailed_menu_ = NULL; |
145 } | 145 } |
146 | 146 |
147 void ClickSpokenFeedbackOnDetailMenu() { | 147 void ClickSpokenFeedbackOnDetailMenu() { |
148 views::View* button = tray()->detailed_menu_->spoken_feedback_view_; | 148 views::View* button = tray()->detailed_menu_->spoken_feedback_view_; |
| 149 ASSERT_TRUE(button); |
149 tray()->detailed_menu_->OnViewClicked(button); | 150 tray()->detailed_menu_->OnViewClicked(button); |
150 } | 151 } |
151 | 152 |
152 void ClickHighContrastOnDetailMenu() { | 153 void ClickHighContrastOnDetailMenu() { |
153 views::View* button = tray()->detailed_menu_->high_contrast_view_; | 154 views::View* button = tray()->detailed_menu_->high_contrast_view_; |
154 EXPECT_TRUE(button); | 155 ASSERT_TRUE(button); |
155 tray()->detailed_menu_->OnViewClicked(button); | 156 tray()->detailed_menu_->OnViewClicked(button); |
156 } | 157 } |
157 | 158 |
158 void ClickScreenMagnifierOnDetailMenu() { | 159 void ClickScreenMagnifierOnDetailMenu() { |
159 views::View* button = tray()->detailed_menu_->screen_magnifier_view_; | 160 views::View* button = tray()->detailed_menu_->screen_magnifier_view_; |
160 EXPECT_TRUE(button); | 161 ASSERT_TRUE(button); |
161 tray()->detailed_menu_->OnViewClicked(button); | 162 tray()->detailed_menu_->OnViewClicked(button); |
162 } | 163 } |
163 | 164 |
164 void ClickAutoclickOnDetailMenu() { | 165 void ClickAutoclickOnDetailMenu() { |
165 views::View* button = tray()->detailed_menu_->autoclick_view_; | 166 views::View* button = tray()->detailed_menu_->autoclick_view_; |
166 EXPECT_TRUE(button); | 167 ASSERT_TRUE(button); |
167 tray()->detailed_menu_->OnViewClicked(button); | 168 tray()->detailed_menu_->OnViewClicked(button); |
168 } | 169 } |
169 | 170 |
| 171 void ClickVirtualKeyboardOnDetailMenu() { |
| 172 views::View* button = tray()->detailed_menu_->virtual_keyboard_view_; |
| 173 ASSERT_TRUE(button); |
| 174 tray()->detailed_menu_->OnViewClicked(button); |
| 175 } |
| 176 |
170 bool IsSpokenFeedbackEnabledOnDetailMenu() { | 177 bool IsSpokenFeedbackEnabledOnDetailMenu() { |
171 return tray()->detailed_menu_->spoken_feedback_enabled_; | 178 return tray()->detailed_menu_->spoken_feedback_enabled_; |
172 } | 179 } |
173 | 180 |
174 bool IsHighContrastEnabledOnDetailMenu() { | 181 bool IsHighContrastEnabledOnDetailMenu() { |
175 return tray()->detailed_menu_->high_contrast_enabled_; | 182 return tray()->detailed_menu_->high_contrast_enabled_; |
176 } | 183 } |
177 | 184 |
178 bool IsScreenMagnifierEnabledOnDetailMenu() { | 185 bool IsScreenMagnifierEnabledOnDetailMenu() { |
179 return tray()->detailed_menu_->screen_magnifier_enabled_; | 186 return tray()->detailed_menu_->screen_magnifier_enabled_; |
180 } | 187 } |
181 | 188 |
182 bool IsLargeCursorEnabledOnDetailMenu() { | 189 bool IsLargeCursorEnabledOnDetailMenu() { |
183 return tray()->detailed_menu_->large_cursor_enabled_; | 190 return tray()->detailed_menu_->large_cursor_enabled_; |
184 } | 191 } |
185 | 192 |
186 bool IsAutoclickEnabledOnDetailMenu() { | 193 bool IsAutoclickEnabledOnDetailMenu() { |
187 return tray()->detailed_menu_->autoclick_enabled_; | 194 return tray()->detailed_menu_->autoclick_enabled_; |
188 } | 195 } |
| 196 |
| 197 bool IsVirtualKeyboardEnabledOnDetailMenu() { |
| 198 return tray()->detailed_menu_->virtual_keyboard_enabled_; |
| 199 } |
| 200 |
189 bool IsSpokenFeedbackMenuShownOnDetailMenu() { | 201 bool IsSpokenFeedbackMenuShownOnDetailMenu() { |
190 return tray()->detailed_menu_->spoken_feedback_view_; | 202 return tray()->detailed_menu_->spoken_feedback_view_; |
191 } | 203 } |
192 | 204 |
193 bool IsHighContrastMenuShownOnDetailMenu() { | 205 bool IsHighContrastMenuShownOnDetailMenu() { |
194 return tray()->detailed_menu_->high_contrast_view_; | 206 return tray()->detailed_menu_->high_contrast_view_; |
195 } | 207 } |
196 | 208 |
197 bool IsScreenMagnifierMenuShownOnDetailMenu() { | 209 bool IsScreenMagnifierMenuShownOnDetailMenu() { |
198 return tray()->detailed_menu_->screen_magnifier_view_; | 210 return tray()->detailed_menu_->screen_magnifier_view_; |
199 } | 211 } |
200 | 212 |
201 bool IsLargeCursorMenuShownOnDetailMenu() { | 213 bool IsLargeCursorMenuShownOnDetailMenu() { |
202 return tray()->detailed_menu_->large_cursor_view_; | 214 return tray()->detailed_menu_->large_cursor_view_; |
203 } | 215 } |
204 | 216 |
205 bool IsAutoclickMenuShownOnDetailMenu() { | 217 bool IsAutoclickMenuShownOnDetailMenu() { |
206 return tray()->detailed_menu_->autoclick_view_; | 218 return tray()->detailed_menu_->autoclick_view_; |
207 } | 219 } |
208 | 220 |
| 221 bool IsVirtualKeyboardMenuShownOnDetailMenu() { |
| 222 return tray()->detailed_menu_->virtual_keyboard_view_; |
| 223 } |
| 224 |
209 policy::MockConfigurationPolicyProvider provider_; | 225 policy::MockConfigurationPolicyProvider provider_; |
210 }; | 226 }; |
211 | 227 |
212 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) { | 228 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) { |
213 EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus()); | 229 EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus()); |
214 | 230 |
215 UserManager::Get()->UserLoggedIn( | 231 UserManager::Get()->UserLoggedIn( |
216 "owner@invalid.domain", "owner@invalid.domain", true); | 232 "owner@invalid.domain", "owner@invalid.domain", true); |
217 UserManager::Get()->SessionStarted(); | 233 UserManager::Get()->SessionStarted(); |
218 | 234 |
(...skipping 26 matching lines...) Expand all Loading... |
245 EXPECT_TRUE(IsTrayIconVisible()); | 261 EXPECT_TRUE(IsTrayIconVisible()); |
246 AccessibilityManager::Get()->EnableHighContrast(false); | 262 AccessibilityManager::Get()->EnableHighContrast(false); |
247 EXPECT_FALSE(IsTrayIconVisible()); | 263 EXPECT_FALSE(IsTrayIconVisible()); |
248 | 264 |
249 // Toggling magnifier the visibility of the icon. | 265 // Toggling magnifier the visibility of the icon. |
250 SetMagnifierEnabled(true); | 266 SetMagnifierEnabled(true); |
251 EXPECT_TRUE(IsTrayIconVisible()); | 267 EXPECT_TRUE(IsTrayIconVisible()); |
252 SetMagnifierEnabled(false); | 268 SetMagnifierEnabled(false); |
253 EXPECT_FALSE(IsTrayIconVisible()); | 269 EXPECT_FALSE(IsTrayIconVisible()); |
254 | 270 |
| 271 // Toggling the virtual keyboard setting changes the visibility of the a11y |
| 272 // icon. |
| 273 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 274 EXPECT_TRUE(IsTrayIconVisible()); |
| 275 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 276 EXPECT_FALSE(IsTrayIconVisible()); |
| 277 |
255 // Enabling all accessibility features. | 278 // Enabling all accessibility features. |
256 SetMagnifierEnabled(true); | 279 SetMagnifierEnabled(true); |
257 EXPECT_TRUE(IsTrayIconVisible()); | 280 EXPECT_TRUE(IsTrayIconVisible()); |
258 AccessibilityManager::Get()->EnableHighContrast(true); | 281 AccessibilityManager::Get()->EnableHighContrast(true); |
259 EXPECT_TRUE(IsTrayIconVisible()); | 282 EXPECT_TRUE(IsTrayIconVisible()); |
260 AccessibilityManager::Get()->EnableSpokenFeedback( | 283 AccessibilityManager::Get()->EnableSpokenFeedback( |
261 true, ash::A11Y_NOTIFICATION_NONE); | 284 true, ash::A11Y_NOTIFICATION_NONE); |
262 EXPECT_TRUE(IsTrayIconVisible()); | 285 EXPECT_TRUE(IsTrayIconVisible()); |
| 286 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 287 EXPECT_TRUE(IsTrayIconVisible()); |
263 AccessibilityManager::Get()->EnableSpokenFeedback( | 288 AccessibilityManager::Get()->EnableSpokenFeedback( |
264 false, ash::A11Y_NOTIFICATION_NONE); | 289 false, ash::A11Y_NOTIFICATION_NONE); |
265 EXPECT_TRUE(IsTrayIconVisible()); | 290 EXPECT_TRUE(IsTrayIconVisible()); |
266 AccessibilityManager::Get()->EnableHighContrast(false); | 291 AccessibilityManager::Get()->EnableHighContrast(false); |
267 EXPECT_TRUE(IsTrayIconVisible()); | 292 EXPECT_TRUE(IsTrayIconVisible()); |
268 SetMagnifierEnabled(false); | 293 SetMagnifierEnabled(false); |
| 294 EXPECT_TRUE(IsTrayIconVisible()); |
| 295 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
269 EXPECT_FALSE(IsTrayIconVisible()); | 296 EXPECT_FALSE(IsTrayIconVisible()); |
270 | 297 |
271 // Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect | 298 // Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect |
272 // the icon on the tray. | 299 // the icon on the tray. |
273 SetShowAccessibilityOptionsInSystemTrayMenu(true); | 300 SetShowAccessibilityOptionsInSystemTrayMenu(true); |
274 AccessibilityManager::Get()->EnableHighContrast(true); | 301 AccessibilityManager::Get()->EnableHighContrast(true); |
275 EXPECT_TRUE(IsTrayIconVisible()); | 302 EXPECT_TRUE(IsTrayIconVisible()); |
276 AccessibilityManager::Get()->EnableHighContrast(false); | 303 AccessibilityManager::Get()->EnableHighContrast(false); |
277 EXPECT_FALSE(IsTrayIconVisible()); | 304 EXPECT_FALSE(IsTrayIconVisible()); |
278 } | 305 } |
(...skipping 28 matching lines...) Expand all Loading... |
307 EXPECT_TRUE(CanCreateMenuItem()); | 334 EXPECT_TRUE(CanCreateMenuItem()); |
308 SetMagnifierEnabled(false); | 335 SetMagnifierEnabled(false); |
309 EXPECT_FALSE(CanCreateMenuItem()); | 336 EXPECT_FALSE(CanCreateMenuItem()); |
310 | 337 |
311 // Toggling autoclick changes the visibility of the menu. | 338 // Toggling autoclick changes the visibility of the menu. |
312 AccessibilityManager::Get()->EnableAutoclick(true); | 339 AccessibilityManager::Get()->EnableAutoclick(true); |
313 EXPECT_TRUE(CanCreateMenuItem()); | 340 EXPECT_TRUE(CanCreateMenuItem()); |
314 AccessibilityManager::Get()->EnableAutoclick(false); | 341 AccessibilityManager::Get()->EnableAutoclick(false); |
315 EXPECT_FALSE(CanCreateMenuItem()); | 342 EXPECT_FALSE(CanCreateMenuItem()); |
316 | 343 |
| 344 // Toggling virtual keyboard changes the visibility of the menu. |
| 345 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 346 EXPECT_TRUE(CanCreateMenuItem()); |
| 347 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 348 EXPECT_FALSE(CanCreateMenuItem()); |
| 349 |
317 // Enabling all accessibility features. | 350 // Enabling all accessibility features. |
318 SetMagnifierEnabled(true); | 351 SetMagnifierEnabled(true); |
319 EXPECT_TRUE(CanCreateMenuItem()); | 352 EXPECT_TRUE(CanCreateMenuItem()); |
320 AccessibilityManager::Get()->EnableHighContrast(true); | 353 AccessibilityManager::Get()->EnableHighContrast(true); |
321 EXPECT_TRUE(CanCreateMenuItem()); | 354 EXPECT_TRUE(CanCreateMenuItem()); |
322 AccessibilityManager::Get()->EnableSpokenFeedback( | 355 AccessibilityManager::Get()->EnableSpokenFeedback( |
323 true, ash::A11Y_NOTIFICATION_NONE); | 356 true, ash::A11Y_NOTIFICATION_NONE); |
324 EXPECT_TRUE(CanCreateMenuItem()); | 357 EXPECT_TRUE(CanCreateMenuItem()); |
325 AccessibilityManager::Get()->EnableAutoclick(true); | 358 AccessibilityManager::Get()->EnableAutoclick(true); |
326 EXPECT_TRUE(CanCreateMenuItem()); | 359 EXPECT_TRUE(CanCreateMenuItem()); |
| 360 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 361 EXPECT_TRUE(CanCreateMenuItem()); |
| 362 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 363 EXPECT_TRUE(CanCreateMenuItem()); |
327 AccessibilityManager::Get()->EnableAutoclick(false); | 364 AccessibilityManager::Get()->EnableAutoclick(false); |
328 EXPECT_TRUE(CanCreateMenuItem()); | 365 EXPECT_TRUE(CanCreateMenuItem()); |
329 AccessibilityManager::Get()->EnableSpokenFeedback( | 366 AccessibilityManager::Get()->EnableSpokenFeedback( |
330 false, ash::A11Y_NOTIFICATION_NONE); | 367 false, ash::A11Y_NOTIFICATION_NONE); |
331 EXPECT_TRUE(CanCreateMenuItem()); | 368 EXPECT_TRUE(CanCreateMenuItem()); |
332 AccessibilityManager::Get()->EnableHighContrast(false); | 369 AccessibilityManager::Get()->EnableHighContrast(false); |
333 EXPECT_TRUE(CanCreateMenuItem()); | 370 EXPECT_TRUE(CanCreateMenuItem()); |
334 SetMagnifierEnabled(false); | 371 SetMagnifierEnabled(false); |
335 EXPECT_FALSE(CanCreateMenuItem()); | 372 EXPECT_FALSE(CanCreateMenuItem()); |
336 } | 373 } |
337 | 374 |
338 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) { | 375 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) { |
339 // Login | 376 // Login |
340 UserManager::Get()->UserLoggedIn( | 377 UserManager::Get()->UserLoggedIn( |
341 "owner@invalid.domain", "owner@invalid.domain", true); | 378 "owner@invalid.domain", "owner@invalid.domain", true); |
342 UserManager::Get()->SessionStarted(); | 379 UserManager::Get()->SessionStarted(); |
343 | 380 |
344 SetShowAccessibilityOptionsInSystemTrayMenu(true); | 381 SetShowAccessibilityOptionsInSystemTrayMenu(true); |
345 | 382 |
346 // Confirms that the menu is visible. | 383 // Confirms that the menu is visible. |
347 EXPECT_TRUE(CanCreateMenuItem()); | 384 EXPECT_TRUE(CanCreateMenuItem()); |
348 | 385 |
349 // The menu is keeping visible regardless of toggling spoken feedback. | 386 // The menu remains visible regardless of toggling spoken feedback. |
350 AccessibilityManager::Get()->EnableSpokenFeedback( | 387 AccessibilityManager::Get()->EnableSpokenFeedback( |
351 true, ash::A11Y_NOTIFICATION_NONE); | 388 true, ash::A11Y_NOTIFICATION_NONE); |
352 EXPECT_TRUE(CanCreateMenuItem()); | 389 EXPECT_TRUE(CanCreateMenuItem()); |
353 AccessibilityManager::Get()->EnableSpokenFeedback( | 390 AccessibilityManager::Get()->EnableSpokenFeedback( |
354 false, ash::A11Y_NOTIFICATION_NONE); | 391 false, ash::A11Y_NOTIFICATION_NONE); |
355 EXPECT_TRUE(CanCreateMenuItem()); | 392 EXPECT_TRUE(CanCreateMenuItem()); |
356 | 393 |
357 // The menu is keeping visible regardless of toggling high contrast. | 394 // The menu remains visible regardless of toggling high contrast. |
358 AccessibilityManager::Get()->EnableHighContrast(true); | 395 AccessibilityManager::Get()->EnableHighContrast(true); |
359 EXPECT_TRUE(CanCreateMenuItem()); | 396 EXPECT_TRUE(CanCreateMenuItem()); |
360 AccessibilityManager::Get()->EnableHighContrast(false); | 397 AccessibilityManager::Get()->EnableHighContrast(false); |
361 EXPECT_TRUE(CanCreateMenuItem()); | 398 EXPECT_TRUE(CanCreateMenuItem()); |
362 | 399 |
363 // The menu is keeping visible regardless of toggling screen magnifier. | 400 // The menu remains visible regardless of toggling screen magnifier. |
364 SetMagnifierEnabled(true); | 401 SetMagnifierEnabled(true); |
365 EXPECT_TRUE(CanCreateMenuItem()); | 402 EXPECT_TRUE(CanCreateMenuItem()); |
366 SetMagnifierEnabled(false); | 403 SetMagnifierEnabled(false); |
367 EXPECT_TRUE(CanCreateMenuItem()); | 404 EXPECT_TRUE(CanCreateMenuItem()); |
368 | 405 |
369 // The menu is keeping visible regardless of toggling autoclick. | 406 // The menu remains visible regardless of toggling autoclick. |
370 AccessibilityManager::Get()->EnableAutoclick(true); | 407 AccessibilityManager::Get()->EnableAutoclick(true); |
371 EXPECT_TRUE(CanCreateMenuItem()); | 408 EXPECT_TRUE(CanCreateMenuItem()); |
372 AccessibilityManager::Get()->EnableAutoclick(false); | 409 AccessibilityManager::Get()->EnableAutoclick(false); |
373 EXPECT_TRUE(CanCreateMenuItem()); | 410 EXPECT_TRUE(CanCreateMenuItem()); |
374 | 411 |
| 412 // The menu remains visible regardless of toggling on-screen keyboard. |
| 413 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 414 EXPECT_TRUE(CanCreateMenuItem()); |
| 415 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 416 EXPECT_TRUE(CanCreateMenuItem()); |
| 417 |
375 // Enabling all accessibility features. | 418 // Enabling all accessibility features. |
376 SetMagnifierEnabled(true); | 419 SetMagnifierEnabled(true); |
377 EXPECT_TRUE(CanCreateMenuItem()); | 420 EXPECT_TRUE(CanCreateMenuItem()); |
378 AccessibilityManager::Get()->EnableHighContrast(true); | 421 AccessibilityManager::Get()->EnableHighContrast(true); |
379 EXPECT_TRUE(CanCreateMenuItem()); | 422 EXPECT_TRUE(CanCreateMenuItem()); |
380 AccessibilityManager::Get()->EnableSpokenFeedback( | 423 AccessibilityManager::Get()->EnableSpokenFeedback( |
381 true, ash::A11Y_NOTIFICATION_NONE); | 424 true, ash::A11Y_NOTIFICATION_NONE); |
382 EXPECT_TRUE(CanCreateMenuItem()); | 425 EXPECT_TRUE(CanCreateMenuItem()); |
383 AccessibilityManager::Get()->EnableAutoclick(true); | 426 AccessibilityManager::Get()->EnableAutoclick(true); |
384 EXPECT_TRUE(CanCreateMenuItem()); | 427 EXPECT_TRUE(CanCreateMenuItem()); |
| 428 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 429 EXPECT_TRUE(CanCreateMenuItem()); |
| 430 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 431 EXPECT_TRUE(CanCreateMenuItem()); |
385 AccessibilityManager::Get()->EnableAutoclick(false); | 432 AccessibilityManager::Get()->EnableAutoclick(false); |
386 EXPECT_TRUE(CanCreateMenuItem()); | 433 EXPECT_TRUE(CanCreateMenuItem()); |
387 AccessibilityManager::Get()->EnableSpokenFeedback( | 434 AccessibilityManager::Get()->EnableSpokenFeedback( |
388 false, ash::A11Y_NOTIFICATION_NONE); | 435 false, ash::A11Y_NOTIFICATION_NONE); |
389 EXPECT_TRUE(CanCreateMenuItem()); | 436 EXPECT_TRUE(CanCreateMenuItem()); |
390 AccessibilityManager::Get()->EnableHighContrast(false); | 437 AccessibilityManager::Get()->EnableHighContrast(false); |
391 EXPECT_TRUE(CanCreateMenuItem()); | 438 EXPECT_TRUE(CanCreateMenuItem()); |
392 SetMagnifierEnabled(false); | 439 SetMagnifierEnabled(false); |
393 EXPECT_TRUE(CanCreateMenuItem()); | 440 EXPECT_TRUE(CanCreateMenuItem()); |
394 | 441 |
395 SetShowAccessibilityOptionsInSystemTrayMenu(false); | 442 SetShowAccessibilityOptionsInSystemTrayMenu(false); |
396 | 443 |
397 // Confirms that the menu is invisible. | 444 // Confirms that the menu is invisible. |
398 EXPECT_FALSE(CanCreateMenuItem()); | 445 EXPECT_FALSE(CanCreateMenuItem()); |
399 } | 446 } |
400 | 447 |
401 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) { | 448 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) { |
402 SetLoginStatus(ash::user::LOGGED_IN_NONE); | 449 SetLoginStatus(ash::user::LOGGED_IN_NONE); |
403 | 450 |
404 // Confirms that the menu is visible. | 451 // Confirms that the menu is visible. |
405 EXPECT_TRUE(CanCreateMenuItem()); | 452 EXPECT_TRUE(CanCreateMenuItem()); |
406 | 453 |
407 // The menu is keeping visible regardless of toggling spoken feedback. | 454 // The menu remains visible regardless of toggling spoken feedback. |
408 AccessibilityManager::Get()->EnableSpokenFeedback( | 455 AccessibilityManager::Get()->EnableSpokenFeedback( |
409 true, ash::A11Y_NOTIFICATION_NONE); | 456 true, ash::A11Y_NOTIFICATION_NONE); |
410 EXPECT_TRUE(CanCreateMenuItem()); | 457 EXPECT_TRUE(CanCreateMenuItem()); |
411 AccessibilityManager::Get()->EnableSpokenFeedback( | 458 AccessibilityManager::Get()->EnableSpokenFeedback( |
412 false, ash::A11Y_NOTIFICATION_NONE); | 459 false, ash::A11Y_NOTIFICATION_NONE); |
413 EXPECT_TRUE(CanCreateMenuItem()); | 460 EXPECT_TRUE(CanCreateMenuItem()); |
414 | 461 |
415 // The menu is keeping visible regardless of toggling high contrast. | 462 // The menu remains visible regardless of toggling high contrast. |
416 AccessibilityManager::Get()->EnableHighContrast(true); | 463 AccessibilityManager::Get()->EnableHighContrast(true); |
417 EXPECT_TRUE(CanCreateMenuItem()); | 464 EXPECT_TRUE(CanCreateMenuItem()); |
418 AccessibilityManager::Get()->EnableHighContrast(false); | 465 AccessibilityManager::Get()->EnableHighContrast(false); |
419 EXPECT_TRUE(CanCreateMenuItem()); | 466 EXPECT_TRUE(CanCreateMenuItem()); |
420 | 467 |
421 // The menu is keeping visible regardless of toggling screen magnifier. | 468 // The menu remains visible regardless of toggling screen magnifier. |
422 SetMagnifierEnabled(true); | 469 SetMagnifierEnabled(true); |
423 EXPECT_TRUE(CanCreateMenuItem()); | 470 EXPECT_TRUE(CanCreateMenuItem()); |
424 SetMagnifierEnabled(false); | 471 SetMagnifierEnabled(false); |
425 EXPECT_TRUE(CanCreateMenuItem()); | 472 EXPECT_TRUE(CanCreateMenuItem()); |
426 | 473 |
| 474 // The menu remains visible regardless of toggling on-screen keyboard. |
| 475 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 476 EXPECT_TRUE(CanCreateMenuItem()); |
| 477 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 478 EXPECT_TRUE(CanCreateMenuItem()); |
| 479 |
427 // Enabling all accessibility features. | 480 // Enabling all accessibility features. |
428 SetMagnifierEnabled(true); | 481 SetMagnifierEnabled(true); |
429 EXPECT_TRUE(CanCreateMenuItem()); | 482 EXPECT_TRUE(CanCreateMenuItem()); |
430 AccessibilityManager::Get()->EnableHighContrast(true); | 483 AccessibilityManager::Get()->EnableHighContrast(true); |
431 EXPECT_TRUE(CanCreateMenuItem()); | 484 EXPECT_TRUE(CanCreateMenuItem()); |
432 AccessibilityManager::Get()->EnableSpokenFeedback( | 485 AccessibilityManager::Get()->EnableSpokenFeedback( |
433 true, ash::A11Y_NOTIFICATION_NONE); | 486 true, ash::A11Y_NOTIFICATION_NONE); |
434 EXPECT_TRUE(CanCreateMenuItem()); | 487 EXPECT_TRUE(CanCreateMenuItem()); |
| 488 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 489 EXPECT_TRUE(CanCreateMenuItem()); |
| 490 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 491 EXPECT_TRUE(CanCreateMenuItem()); |
435 AccessibilityManager::Get()->EnableSpokenFeedback( | 492 AccessibilityManager::Get()->EnableSpokenFeedback( |
436 false, ash::A11Y_NOTIFICATION_NONE); | 493 false, ash::A11Y_NOTIFICATION_NONE); |
437 EXPECT_TRUE(CanCreateMenuItem()); | 494 EXPECT_TRUE(CanCreateMenuItem()); |
438 AccessibilityManager::Get()->EnableHighContrast(false); | 495 AccessibilityManager::Get()->EnableHighContrast(false); |
439 EXPECT_TRUE(CanCreateMenuItem()); | 496 EXPECT_TRUE(CanCreateMenuItem()); |
440 SetMagnifierEnabled(false); | 497 SetMagnifierEnabled(false); |
441 EXPECT_TRUE(CanCreateMenuItem()); | 498 EXPECT_TRUE(CanCreateMenuItem()); |
442 | 499 |
443 SetShowAccessibilityOptionsInSystemTrayMenu(true); | 500 SetShowAccessibilityOptionsInSystemTrayMenu(true); |
444 | 501 |
445 // Confirms that the menu is keeping visible. | 502 // Confirms that the menu remains visible. |
446 EXPECT_TRUE(CanCreateMenuItem()); | 503 EXPECT_TRUE(CanCreateMenuItem()); |
447 | 504 |
448 SetShowAccessibilityOptionsInSystemTrayMenu(false); | 505 SetShowAccessibilityOptionsInSystemTrayMenu(false); |
449 | 506 |
450 // Confirms that the menu is keeping visible. | 507 // Confirms that the menu remains visible. |
451 EXPECT_TRUE(CanCreateMenuItem()); | 508 EXPECT_TRUE(CanCreateMenuItem()); |
452 } | 509 } |
453 | 510 |
454 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, KeepMenuVisibilityOnLockScreen) { | 511 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, KeepMenuVisibilityOnLockScreen) { |
455 // Enables high contrast mode. | 512 // Enables high contrast mode. |
456 AccessibilityManager::Get()->EnableHighContrast(true); | 513 AccessibilityManager::Get()->EnableHighContrast(true); |
457 EXPECT_TRUE(CanCreateMenuItem()); | 514 EXPECT_TRUE(CanCreateMenuItem()); |
458 | 515 |
459 // Locks the screen. | 516 // Locks the screen. |
460 SetLoginStatus(ash::user::LOGGED_IN_LOCKED); | 517 SetLoginStatus(ash::user::LOGGED_IN_LOCKED); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 // Confirms that the check item toggles autoclick. | 568 // Confirms that the check item toggles autoclick. |
512 EXPECT_FALSE(AccessibilityManager::Get()->IsAutoclickEnabled()); | 569 EXPECT_FALSE(AccessibilityManager::Get()->IsAutoclickEnabled()); |
513 | 570 |
514 EXPECT_TRUE(CreateDetailedMenu()); | 571 EXPECT_TRUE(CreateDetailedMenu()); |
515 ClickAutoclickOnDetailMenu(); | 572 ClickAutoclickOnDetailMenu(); |
516 EXPECT_TRUE(AccessibilityManager::Get()->IsAutoclickEnabled()); | 573 EXPECT_TRUE(AccessibilityManager::Get()->IsAutoclickEnabled()); |
517 | 574 |
518 EXPECT_TRUE(CreateDetailedMenu()); | 575 EXPECT_TRUE(CreateDetailedMenu()); |
519 ClickAutoclickOnDetailMenu(); | 576 ClickAutoclickOnDetailMenu(); |
520 EXPECT_FALSE(AccessibilityManager::Get()->IsAutoclickEnabled()); | 577 EXPECT_FALSE(AccessibilityManager::Get()->IsAutoclickEnabled()); |
| 578 |
| 579 // Confirms that the check item toggles on-screen keyboard. |
| 580 EXPECT_FALSE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled()); |
| 581 |
| 582 EXPECT_TRUE(CreateDetailedMenu()); |
| 583 ClickVirtualKeyboardOnDetailMenu(); |
| 584 EXPECT_TRUE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled()); |
| 585 |
| 586 EXPECT_TRUE(CreateDetailedMenu()); |
| 587 ClickVirtualKeyboardOnDetailMenu(); |
| 588 EXPECT_FALSE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled()); |
521 } | 589 } |
522 | 590 |
523 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) { | 591 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) { |
524 SetLoginStatus(ash::user::LOGGED_IN_NONE); | 592 SetLoginStatus(ash::user::LOGGED_IN_NONE); |
525 | 593 |
526 // At first, all of the check is unchecked. | 594 // At first, all of the check is unchecked. |
527 EXPECT_TRUE(CreateDetailedMenu()); | 595 EXPECT_TRUE(CreateDetailedMenu()); |
528 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 596 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
529 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 597 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
530 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 598 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
531 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 599 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
532 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 600 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
533 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 601 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
534 CloseDetailMenu(); | 602 CloseDetailMenu(); |
535 | 603 |
536 // Enabling spoken feedback. | 604 // Enabling spoken feedback. |
537 AccessibilityManager::Get()->EnableSpokenFeedback( | 605 AccessibilityManager::Get()->EnableSpokenFeedback( |
538 true, ash::A11Y_NOTIFICATION_NONE); | 606 true, ash::A11Y_NOTIFICATION_NONE); |
539 EXPECT_TRUE(CreateDetailedMenu()); | 607 EXPECT_TRUE(CreateDetailedMenu()); |
540 EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu()); | 608 EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu()); |
541 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 609 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
542 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 610 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
543 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 611 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
544 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 612 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 613 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
545 CloseDetailMenu(); | 614 CloseDetailMenu(); |
546 | 615 |
547 // Disabling spoken feedback. | 616 // Disabling spoken feedback. |
548 AccessibilityManager::Get()->EnableSpokenFeedback( | 617 AccessibilityManager::Get()->EnableSpokenFeedback( |
549 false, ash::A11Y_NOTIFICATION_NONE); | 618 false, ash::A11Y_NOTIFICATION_NONE); |
550 EXPECT_TRUE(CreateDetailedMenu()); | 619 EXPECT_TRUE(CreateDetailedMenu()); |
551 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 620 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
552 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 621 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
553 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 622 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
554 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 623 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
555 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 624 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 625 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
556 CloseDetailMenu(); | 626 CloseDetailMenu(); |
557 | 627 |
558 // Enabling high contrast. | 628 // Enabling high contrast. |
559 AccessibilityManager::Get()->EnableHighContrast(true); | 629 AccessibilityManager::Get()->EnableHighContrast(true); |
560 EXPECT_TRUE(CreateDetailedMenu()); | 630 EXPECT_TRUE(CreateDetailedMenu()); |
561 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 631 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
562 EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu()); | 632 EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu()); |
563 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 633 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
564 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 634 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
565 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 635 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 636 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
566 CloseDetailMenu(); | 637 CloseDetailMenu(); |
567 | 638 |
568 // Disabling high contrast. | 639 // Disabling high contrast. |
569 AccessibilityManager::Get()->EnableHighContrast(false); | 640 AccessibilityManager::Get()->EnableHighContrast(false); |
570 EXPECT_TRUE(CreateDetailedMenu()); | 641 EXPECT_TRUE(CreateDetailedMenu()); |
571 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 642 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
572 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 643 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
573 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 644 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
574 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 645 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
575 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 646 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 647 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
576 CloseDetailMenu(); | 648 CloseDetailMenu(); |
577 | 649 |
578 // Enabling full screen magnifier. | 650 // Enabling full screen magnifier. |
579 SetMagnifierEnabled(true); | 651 SetMagnifierEnabled(true); |
580 EXPECT_TRUE(CreateDetailedMenu()); | 652 EXPECT_TRUE(CreateDetailedMenu()); |
581 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 653 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
582 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 654 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
583 EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu()); | 655 EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu()); |
584 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 656 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
585 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 657 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 658 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
586 CloseDetailMenu(); | 659 CloseDetailMenu(); |
587 | 660 |
588 // Disabling screen magnifier. | 661 // Disabling screen magnifier. |
589 SetMagnifierEnabled(false); | 662 SetMagnifierEnabled(false); |
590 EXPECT_TRUE(CreateDetailedMenu()); | 663 EXPECT_TRUE(CreateDetailedMenu()); |
591 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 664 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
592 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 665 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
593 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 666 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
594 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 667 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
595 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 668 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 669 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
596 CloseDetailMenu(); | 670 CloseDetailMenu(); |
597 | 671 |
598 // Enabling large cursor. | 672 // Enabling large cursor. |
599 AccessibilityManager::Get()->EnableLargeCursor(true); | 673 AccessibilityManager::Get()->EnableLargeCursor(true); |
600 EXPECT_TRUE(CreateDetailedMenu()); | 674 EXPECT_TRUE(CreateDetailedMenu()); |
601 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 675 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
602 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 676 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
603 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 677 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
604 EXPECT_TRUE(IsLargeCursorEnabledOnDetailMenu()); | 678 EXPECT_TRUE(IsLargeCursorEnabledOnDetailMenu()); |
605 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 679 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 680 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
606 CloseDetailMenu(); | 681 CloseDetailMenu(); |
607 | 682 |
608 // Disabling large cursor. | 683 // Disabling large cursor. |
609 AccessibilityManager::Get()->EnableLargeCursor(false); | 684 AccessibilityManager::Get()->EnableLargeCursor(false); |
610 EXPECT_TRUE(CreateDetailedMenu()); | 685 EXPECT_TRUE(CreateDetailedMenu()); |
611 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 686 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
612 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 687 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
613 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 688 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
614 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 689 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
615 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 690 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 691 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
| 692 CloseDetailMenu(); |
| 693 |
| 694 // Enable on-screen keyboard. |
| 695 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
| 696 EXPECT_TRUE(CreateDetailedMenu()); |
| 697 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
| 698 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
| 699 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
| 700 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
| 701 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 702 EXPECT_TRUE(IsVirtualKeyboardEnabledOnDetailMenu()); |
| 703 CloseDetailMenu(); |
| 704 |
| 705 // Disable on-screen keyboard. |
| 706 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
| 707 EXPECT_TRUE(CreateDetailedMenu()); |
| 708 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
| 709 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
| 710 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
| 711 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
| 712 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 713 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
616 CloseDetailMenu(); | 714 CloseDetailMenu(); |
617 | 715 |
618 // Enabling all of the a11y features. | 716 // Enabling all of the a11y features. |
619 AccessibilityManager::Get()->EnableSpokenFeedback( | 717 AccessibilityManager::Get()->EnableSpokenFeedback( |
620 true, ash::A11Y_NOTIFICATION_NONE); | 718 true, ash::A11Y_NOTIFICATION_NONE); |
621 AccessibilityManager::Get()->EnableHighContrast(true); | 719 AccessibilityManager::Get()->EnableHighContrast(true); |
622 SetMagnifierEnabled(true); | 720 SetMagnifierEnabled(true); |
623 AccessibilityManager::Get()->EnableLargeCursor(true); | 721 AccessibilityManager::Get()->EnableLargeCursor(true); |
| 722 AccessibilityManager::Get()->EnableVirtualKeyboard(true); |
624 EXPECT_TRUE(CreateDetailedMenu()); | 723 EXPECT_TRUE(CreateDetailedMenu()); |
625 EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu()); | 724 EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu()); |
626 EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu()); | 725 EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu()); |
627 EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu()); | 726 EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu()); |
628 EXPECT_TRUE(IsLargeCursorEnabledOnDetailMenu()); | 727 EXPECT_TRUE(IsLargeCursorEnabledOnDetailMenu()); |
629 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 728 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 729 EXPECT_TRUE(IsVirtualKeyboardEnabledOnDetailMenu()); |
630 CloseDetailMenu(); | 730 CloseDetailMenu(); |
631 | 731 |
632 // Disabling all of the a11y features. | 732 // Disabling all of the a11y features. |
633 AccessibilityManager::Get()->EnableSpokenFeedback( | 733 AccessibilityManager::Get()->EnableSpokenFeedback( |
634 false, ash::A11Y_NOTIFICATION_NONE); | 734 false, ash::A11Y_NOTIFICATION_NONE); |
635 AccessibilityManager::Get()->EnableHighContrast(false); | 735 AccessibilityManager::Get()->EnableHighContrast(false); |
636 SetMagnifierEnabled(false); | 736 SetMagnifierEnabled(false); |
637 AccessibilityManager::Get()->EnableLargeCursor(false); | 737 AccessibilityManager::Get()->EnableLargeCursor(false); |
| 738 AccessibilityManager::Get()->EnableVirtualKeyboard(false); |
638 EXPECT_TRUE(CreateDetailedMenu()); | 739 EXPECT_TRUE(CreateDetailedMenu()); |
639 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 740 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
640 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 741 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
641 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 742 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
642 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 743 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
643 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 744 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 745 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
644 CloseDetailMenu(); | 746 CloseDetailMenu(); |
645 | 747 |
646 // Autoclick is disabled on login screen. | 748 // Autoclick is disabled on login screen. |
647 SetLoginStatus(ash::user::LOGGED_IN_USER); | 749 SetLoginStatus(ash::user::LOGGED_IN_USER); |
648 | 750 |
649 // Enabling autoclick. | 751 // Enabling autoclick. |
650 AccessibilityManager::Get()->EnableAutoclick(true); | 752 AccessibilityManager::Get()->EnableAutoclick(true); |
651 EXPECT_TRUE(CreateDetailedMenu()); | 753 EXPECT_TRUE(CreateDetailedMenu()); |
652 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 754 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
653 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 755 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
654 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 756 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
655 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 757 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
656 EXPECT_TRUE(IsAutoclickEnabledOnDetailMenu()); | 758 EXPECT_TRUE(IsAutoclickEnabledOnDetailMenu()); |
| 759 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
657 CloseDetailMenu(); | 760 CloseDetailMenu(); |
658 | 761 |
659 // Disabling autoclick. | 762 // Disabling autoclick. |
660 AccessibilityManager::Get()->EnableAutoclick(false); | 763 AccessibilityManager::Get()->EnableAutoclick(false); |
661 EXPECT_TRUE(CreateDetailedMenu()); | 764 EXPECT_TRUE(CreateDetailedMenu()); |
662 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); | 765 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu()); |
663 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); | 766 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu()); |
664 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); | 767 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu()); |
665 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); | 768 EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu()); |
666 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); | 769 EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu()); |
| 770 EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu()); |
667 CloseDetailMenu(); | 771 CloseDetailMenu(); |
668 } | 772 } |
669 | 773 |
670 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) { | 774 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) { |
671 SetLoginStatus(ash::user::LOGGED_IN_NONE); | 775 SetLoginStatus(ash::user::LOGGED_IN_NONE); |
672 EXPECT_TRUE(CreateDetailedMenu()); | 776 EXPECT_TRUE(CreateDetailedMenu()); |
673 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); | 777 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); |
674 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); | 778 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); |
675 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); | 779 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); |
676 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); | 780 EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu()); |
677 EXPECT_FALSE(IsAutoclickMenuShownOnDetailMenu()); | 781 EXPECT_FALSE(IsAutoclickMenuShownOnDetailMenu()); |
| 782 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); |
678 CloseDetailMenu(); | 783 CloseDetailMenu(); |
679 | 784 |
680 SetLoginStatus(ash::user::LOGGED_IN_USER); | 785 SetLoginStatus(ash::user::LOGGED_IN_USER); |
681 EXPECT_TRUE(CreateDetailedMenu()); | 786 EXPECT_TRUE(CreateDetailedMenu()); |
682 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); | 787 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); |
683 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); | 788 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); |
684 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); | 789 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); |
685 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); | 790 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); |
686 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); | 791 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); |
| 792 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); |
687 CloseDetailMenu(); | 793 CloseDetailMenu(); |
688 | 794 |
689 SetLoginStatus(ash::user::LOGGED_IN_LOCKED); | 795 SetLoginStatus(ash::user::LOGGED_IN_LOCKED); |
690 EXPECT_TRUE(CreateDetailedMenu()); | 796 EXPECT_TRUE(CreateDetailedMenu()); |
691 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); | 797 EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu()); |
692 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); | 798 EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu()); |
693 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); | 799 EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu()); |
694 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); | 800 EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu()); |
695 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); | 801 EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu()); |
| 802 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); |
696 CloseDetailMenu(); | 803 CloseDetailMenu(); |
697 } | 804 } |
698 | 805 |
699 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, | 806 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, |
700 TrayAccessibilityTest, | 807 TrayAccessibilityTest, |
701 testing::Values(PREF_SERVICE, | 808 testing::Values(PREF_SERVICE, |
702 POLICY)); | 809 POLICY)); |
703 | 810 |
704 } // namespace chromeos | 811 } // namespace chromeos |
OLD | NEW |