Misc fixes
- remove useless intent-filters on a few activities - Fix condition layout (icon size too big) - clicking airplane condition card no longer crashes Fixes: 72314527 Test: logcat | grep -i "TileUtils" and observe no more warning log Change-Id: I3c6f9fb4f4e480ade220bc8602c04de5332d551c
This commit is contained in:
@@ -1086,9 +1086,6 @@
|
|||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="com.android.settings.SHORTCUT" />
|
<category android:name="com.android.settings.SHORTCUT" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<intent-filter android:priority="3">
|
|
||||||
<action android:name="com.android.settings.action.SETTINGS" />
|
|
||||||
</intent-filter>
|
|
||||||
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||||
android:value="com.android.settings.applications.ProcessStatsSummary" />
|
android:value="com.android.settings.applications.ProcessStatsSummary" />
|
||||||
</activity>
|
</activity>
|
||||||
@@ -3061,9 +3058,6 @@
|
|||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.VOICE_LAUNCH" />
|
<category android:name="android.intent.category.VOICE_LAUNCH" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<intent-filter android:priority="60">
|
|
||||||
<action android:name="com.android.settings.action.SETTINGS" />
|
|
||||||
</intent-filter>
|
|
||||||
<meta-data android:name="com.android.settings.summary"
|
<meta-data android:name="com.android.settings.summary"
|
||||||
android:resource="@string/summary_empty"/>
|
android:resource="@string/summary_empty"/>
|
||||||
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
|
||||||
|
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_marginStart="0dp"
|
android:layout_marginStart="0dp"
|
||||||
android:layout_marginEnd="24dp"
|
android:layout_marginEnd="24dp"
|
||||||
android:tint="?android:attr/colorAccent"
|
android:tint="?android:attr/colorAccent"
|
||||||
|
@@ -30,8 +30,8 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
android:layout_marginStart="14dp"
|
android:layout_marginStart="14dp"
|
||||||
android:layout_marginEnd="24dp"
|
android:layout_marginEnd="24dp"
|
||||||
|
@@ -30,8 +30,8 @@
|
|||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/suggestion_card_icon_size"
|
||||||
android:layout_marginStart="14dp"
|
android:layout_marginStart="14dp"
|
||||||
android:layout_marginEnd="24dp" />
|
android:layout_marginEnd="24dp" />
|
||||||
|
|
||||||
|
@@ -21,10 +21,11 @@ import android.content.Intent;
|
|||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.graphics.drawable.Icon;
|
import android.graphics.drawable.Icon;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
|
import android.provider.Settings;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.Settings;
|
|
||||||
import com.android.settingslib.WirelessUtils;
|
import com.android.settingslib.WirelessUtils;
|
||||||
|
|
||||||
public class AirplaneModeCondition extends Condition {
|
public class AirplaneModeCondition extends Condition {
|
||||||
@@ -79,13 +80,14 @@ public class AirplaneModeCondition extends Condition {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CharSequence[] getActions() {
|
public CharSequence[] getActions() {
|
||||||
return new CharSequence[] { mManager.getContext().getString(R.string.condition_turn_off) };
|
return new CharSequence[] {mManager.getContext().getString(R.string.condition_turn_off)};
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPrimaryClick() {
|
public void onPrimaryClick() {
|
||||||
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
mManager.getContext().startActivity(
|
||||||
Settings.NetworkDashboardActivity.class));
|
new Intent(Settings.ACTION_WIRELESS_SETTINGS)
|
||||||
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -56,7 +56,7 @@ public class BackgroundDataCondition extends Condition {
|
|||||||
@Override
|
@Override
|
||||||
public void onPrimaryClick() {
|
public void onPrimaryClick() {
|
||||||
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
||||||
Settings.DataUsageSummaryActivity.class));
|
Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -80,7 +80,7 @@ public class CellularDataCondition extends Condition {
|
|||||||
@Override
|
@Override
|
||||||
public void onPrimaryClick() {
|
public void onPrimaryClick() {
|
||||||
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
||||||
Settings.DataUsageSummaryActivity.class));
|
Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -22,6 +22,7 @@ import android.content.pm.UserInfo;
|
|||||||
import android.graphics.drawable.Icon;
|
import android.graphics.drawable.Icon;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.Settings;
|
import com.android.settings.Settings;
|
||||||
@@ -84,7 +85,8 @@ public class WorkModeCondition extends Condition {
|
|||||||
@Override
|
@Override
|
||||||
public void onPrimaryClick() {
|
public void onPrimaryClick() {
|
||||||
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
mManager.getContext().startActivity(new Intent(mManager.getContext(),
|
||||||
Settings.UserAndAccountDashboardActivity.class));
|
Settings.UserAndAccountDashboardActivity.class)
|
||||||
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user