App header cleanup
- Refactor the entity header layout to use LinearLayout and add id to content area - Remove now unused AppHeader class - Make entire icon+text area clickable and link to app info page Refactor the binding logic from bindButton to its own method. - Remove unused MultiLinePreference Fix: 62705377 Test: make RunSettingsRoboTests Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
This commit is contained in:
@@ -36,7 +36,6 @@ import android.view.View;
|
||||
import android.widget.Switch;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.AppHeader;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.RingtonePreference;
|
||||
import com.android.settings.Utils;
|
||||
@@ -146,8 +145,9 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
|
||||
.setSummary(mAppRow.label)
|
||||
.setPackageName(mAppRow.pkg)
|
||||
.setUid(mAppRow.uid)
|
||||
.setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO,
|
||||
EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
|
||||
.setButtonActions(EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
|
||||
EntityHeaderController.ActionType.ACTION_NONE)
|
||||
.setHasAppInfoLink(true)
|
||||
.done(activity, getPrefContext());
|
||||
getPreferenceScreen().addPreference(pref);
|
||||
}
|
||||
@@ -283,7 +283,6 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
|
||||
mImportance = findPreference(KEY_IMPORTANCE);
|
||||
Bundle channelArgs = new Bundle();
|
||||
channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mUid);
|
||||
channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
|
||||
channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
|
||||
channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
|
||||
mImportance.setEnabled(mSuspendedAppsAdmin == null && isChannelConfigurable(mChannel));
|
||||
|
Reference in New Issue
Block a user