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

Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5

Browse Source 
Change-Id: Ida02e3e49ab0210d8494d6e919b5048895f1eae0
This commit is contained in:
TreeHugger Robot
2020-03-27 03:28:47 +00:00
committed by Automerger Merge Worker
parent e7466934b7 b11a46cfd5
commit 35adcca607
5 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/panel/MediaOutputPanel.java
View File

@@ -166,7 +166,7 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
}
@Override
public CharSequence getCustomButtonTitle() {
public CharSequence getCustomizedButtonTitle() {
return mContext.getText(R.string.media_output_panel_stop_casting_button);
}

4
src/com/android/settings/panel/PanelContent.java
View File

@@ -86,9 +86,9 @@ public interface PanelContent extends Instrumentable {
}
/**
* @return a string for the title of the custom button.
* @return a string for the title of the customized button.
*/
default CharSequence getCustomButtonTitle() {
default CharSequence getCustomizedButtonTitle() {
return null;
}

3
src/com/android/settings/panel/PanelFragment.java
View File

@@ -222,7 +222,7 @@ public class PanelFragment extends Fragment {
mDoneButton.setOnClickListener(getCloseListener());
if (mPanel.isCustomizedButtonUsed()) {
final CharSequence customTitle = mPanel.getCustomButtonTitle();
final CharSequence customTitle = mPanel.getCustomizedButtonTitle();
if (TextUtils.isEmpty(customTitle)) {
mSeeMoreButton.setVisibility(View.GONE);
} else {
@@ -428,6 +428,7 @@ public class PanelFragment extends Fragment {
ThreadUtils.postOnMainThread(() -> {
mSeeMoreButton.setVisibility(
mPanel.isCustomizedButtonUsed() ? View.VISIBLE : View.GONE);
mSeeMoreButton.setText(mPanel.getCustomizedButtonTitle());
});
}