Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added secondary label to flashlight"

Browse Source
This commit is contained in:
Fabian Kozynski
2019-10-03 15:36:51 +00:00
committed by Android (Google) Code Review
parent fafb6cf312 2f9dd75611
commit 0cdb7e9570
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -860,6 +860,8 @@
<string name="quick_settings_notifications_label">Notifications</string>
<!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
<string name="quick_settings_flashlight_label">Flashlight</string>
<!-- QuickSettings: Flashlight, used when it's not available due to camera in use [CHAR LIMIT=NONE] -->
<string name="quick_settings_flashlight_camera_in_use">Camera in use</string>
<!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
<string name="quick_settings_cellular_detail_title">Mobile data</string>
<!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->

6
packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java
View File

@@ -101,11 +101,15 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements
state.slash = new SlashState();
}
state.label = mHost.getContext().getString(R.string.quick_settings_flashlight_label);
state.secondaryLabel = "";
if (!mFlashlightController.isAvailable()) {
state.icon = mIcon;
state.slash.isSlashed = true;
state.secondaryLabel = mContext.getString(
R.string.quick_settings_flashlight_camera_in_use);
state.contentDescription = mContext.getString(
R.string.accessibility_quick_settings_flashlight_unavailable);
R.string.accessibility_quick_settings_flashlight_unavailable)
+ ", " + state.secondaryLabel;
state.state = Tile.STATE_UNAVAILABLE;
return;
}