PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Hotspot condition string truncated"

Browse Source
This commit is contained in:
Fan Zhang
2019-03-07 21:53:05 +00:00
committed by Android (Google) Code Review
parent 4dfa94f5f6 24ff4a2110
commit cec74ac982
4 changed files with 90 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
View File

@@ -97,7 +97,7 @@ public class HotspotConditionController implements ConditionalCardController {
.setName(mAppContext.getPackageName() + "/"
+ mAppContext.getText(R.string.condition_hotspot_title))
.setTitleText(mAppContext.getText(R.string.condition_hotspot_title).toString())
.setSummaryText(getSummary().toString())
.setSummaryText(getSsid().toString())
.setIconDrawable(mAppContext.getDrawable(R.drawable.ic_hotspot))
.setViewType(ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH)
.build();
@@ -113,10 +113,6 @@ public class HotspotConditionController implements ConditionalCardController {
mAppContext.unregisterReceiver(mReceiver);
}
public CharSequence getSummary() {
return mAppContext.getString(R.string.condition_hotspot_summary, getSsid());
}
private CharSequence getSsid() {
WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
if (wifiConfig == null) {