Projects >> frameworks_base_disabled >>90e356dfd40818d68df55d7edc1b8d960bbde1f9

Chunk
Conflicting content 
                    if (mLockAlwaysBattery) {
                        // Show battery at low percent
                        string = getContext().getString(R.string.lockscreen_always_battery,
<<<<<<< HEAD
                                mBatteryLevel);
                        icon.value = BATTERY_LOW_ICON;
=======
                                icon.value = BATTERY_LOW_ICON);
>>>>>>> 7b0e48be4975af6a8f9f43105b14deb99b0059d7
                    }
                } else {
                    // Always show battery
Solution content 
                    if (mLockAlwaysBattery) {
                        // Show battery at low percent
                        string = getContext().getString(R.string.lockscreen_always_battery,
                                mBatteryLevel);
                        icon.value = BATTERY_LOW_ICON;
                    }
                } else {
                    // Always show battery
File
KeyguardStatusViewManager.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
                    if (mLockAlwaysBattery) {
                        // Show battery at low percent
                        string = getContext().getString(R.string.lockscreen_always_battery,
<<<<<<< HEAD
                                mBatteryLevel);
                        icon.value = BATTERY_LOW_ICON;
=======
                                icon.value = BATTERY_LOW_ICON);
>>>>>>> 7b0e48be4975af6a8f9f43105b14deb99b0059d7
                    }
                } else {
                    // Always show battery
Solution content 
                    if (mLockAlwaysBattery) {
                        // Show battery at low percent
                        string = getContext().getString(R.string.lockscreen_always_battery,
                                mBatteryLevel);
                        icon.value = BATTERY_LOW_ICON;
                    }
                } else {
                    // Always show battery
File
KeyguardStatusViewManager.java
Developer's decision
Version 1
Kind of conflict
Attribute