Skip to content

Commit

Permalink
[M103] Fix notification issue when Kiosk app opened
Browse files Browse the repository at this point in the history
The current logic of showing "ask admin to set up the device"
notification depends on the visibility of the Kiosk app button. However,
Kiosk button is hidden when Kiosk app is opened, and the notification
is shown by mistake.

We should show the notification only when no Kiosk app is setup.

Bug: b/234765162
Change-Id: I6301e74b96455c76546421705ecb160b5c6fa403
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3692640
Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Commit-Queue: Yunke Zhou <yunkez@google.com>
Cr-Commit-Position: refs/branch-heads/5060@{#644}
Cr-Branched-From: b83393d-refs/heads/main@{#1002911}
  • Loading branch information
Yunke Zhou authored and Chromium LUCI CQ committed Jun 7, 2022
1 parent e598def commit 3af3e61
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ash/shelf/login_shelf_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -750,8 +750,10 @@ void LoginShelfView::SetKioskApps(
kiosk_apps_button_->SetApps(kiosk_apps);
UpdateUi();
if (LockScreen::HasInstance()) {
// Consider Kiosk apps button to be present when there are Kiosk apps installed.
// TODO(b/234765162): rename the method as the naming is confusing.
LockScreen::Get()->SetKioskAppsButtonPresence(
kiosk_apps_button_->GetVisible());
kiosk_apps_button_->HasApps());
}
}

Expand Down

0 comments on commit 3af3e61

Please sign in to comment.