Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gaming queso #3

Open
wants to merge 5 commits into
base: queso
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3307,6 +3307,20 @@
android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
</activity>

<!-- Gaming mode -->
<activity android:name=".Settings$GamingModeActivity"
android:label="@string/gaming_mode_title"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.GAMING_MODE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.bootleggers.dumpster.fragments.GamingMode" />
</activity>


<!-- This is the longest AndroidManifest.xml ever. -->

<!-- Bootleg Dumpster activity -->
Expand Down
4 changes: 4 additions & 0 deletions src/com/android/settings/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ public static class StorageDashboardActivity extends SettingsActivity {}
public static class AccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity extends SettingsActivity {}

// Gaming mode
public static class GamingModeActivity extends SettingsActivity {}


// Bootleggers aditional Additions.
public static class BootlegDumpsterActivity extends SettingsActivity {}

Expand Down
5 changes: 4 additions & 1 deletion src/com/android/settings/core/gateway/SettingsGateway.java
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
import com.android.settings.wifi.tether.WifiTetherSettings;

import com.bootleggers.dumpster.MainDump;
import com.bootleggers.dumpster.fragments.GamingMode;
import com.bootleggers.dumpster.fragments.PowerMenuSettings;
import com.bootleggers.dumpster.external.OmniJawsSettings;

Expand Down Expand Up @@ -292,7 +293,8 @@ public class SettingsGateway {
MainDump.class.getName(),
PowerMenuSettings.class.getName(),
RunningServices.class.getName(),
OmniJawsSettings.class.getName()
OmniJawsSettings.class.getName(),
GamingMode.class.getName()
};

public static final String[] SETTINGS_FOR_RESTRICTED = {
Expand Down Expand Up @@ -335,5 +337,6 @@ public class SettingsGateway {
Settings.PowerMenuSettings.class.getName(),
Settings.DevRunningServicesActivity.class.getName(),
Settings.OmniJawsSettingsActivity.class.getName(),
Settings.GamingModeActivity.class.getName(),
};
}
29 changes: 24 additions & 5 deletions src/com/android/settings/fuelgauge/BatteryInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class BatteryInfo {
private BatteryStats mStats;
private static final String LOG_TAG = "BatteryInfo";
private long timePeriod;
private String chargeStatusLabel;

public interface Callback {
void onBatteryInfoLoaded(BatteryInfo info);
Expand Down Expand Up @@ -250,23 +251,41 @@ private static void updateBatteryInfoCharging(Context context, Intent batteryBro
final long chargeTime = stats.computeChargeTimeRemaining(elapsedRealtimeUs);
final int status = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
BatteryManager.BATTERY_STATUS_UNKNOWN);
final boolean dashChargeStatus = batteryBroadcast.getBooleanExtra(
BatteryManager.EXTRA_DASH_CHARGER, false);
final boolean warpChargeStatus = batteryBroadcast.getBooleanExtra(
BatteryManager.EXTRA_WARP_CHARGER, false);
info.discharging = false;
info.suggestionLabel = null;
info.chargeStatusLabel = null;
if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
info.remainingTimeUs = chargeTime;
CharSequence timeString = StringUtil.formatElapsedTime(context,
PowerUtil.convertUsToMs(info.remainingTimeUs), false /* withSeconds */);
int resId = R.string.power_charging_duration;
info.remainingLabel = context.getString(
R.string.power_remaining_charging_duration_only, timeString);
if (dashChargeStatus) {
info.remainingLabel = context.getString(
R.string.power_remaining_dash_charging_duration_only, timeString);
} else if (warpChargeStatus) {
info.remainingLabel = context.getString(
R.string.power_remaining_warp_charging_duration_only, timeString);
} else {
info.remainingLabel = context.getString(
R.string.power_remaining_charging_duration_only, timeString);
}
info.chargeLabel = context.getString(resId, info.batteryPercentString, timeString);
} else {
final String chargeStatusLabel = resources.getString(
R.string.battery_info_status_charging_lower);
if (dashChargeStatus) {
info.chargeStatusLabel = resources.getString(R.string.battery_info_status_dash_charging_lower);
} else if (warpChargeStatus) {
info.chargeStatusLabel = resources.getString(R.string.battery_info_status_warp_charging_lower);
} else {
info.chargeStatusLabel = resources.getString(R.string.battery_info_status_charging_lower);
}
info.remainingLabel = null;
info.chargeLabel = info.batteryLevel == 100 ? info.batteryPercentString :
resources.getString(R.string.power_charging, info.batteryPercentString,
chargeStatusLabel);
info.chargeStatusLabel);
}
}

Expand Down