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

Framework: Whitespace cleanup #5

Merged
merged 1 commit into from
Nov 10, 2012
Merged

Framework: Whitespace cleanup #5

merged 1 commit into from
Nov 10, 2012

Conversation

corcoran
Copy link

Change-Id: I3dc933297c9e95c42d22de35d972dea850ae1ed7

Change-Id: I3dc933297c9e95c42d22de35d972dea850ae1ed7
kufikugel added a commit that referenced this pull request Nov 10, 2012
Framework: Whitespace cleanup

thanks a bunch for correcting!!!!!!!!!!!
@kufikugel kufikugel merged commit 55910ee into SlimRoms:jb Nov 10, 2012
@kufikugel
Copy link

thanks a bunch for correcting!!!!!!!!!!!

SeniorLimpio pushed a commit to SeniorLimpio/frameworks_base that referenced this pull request Mar 13, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
anerikg pushed a commit to thelegorom/frameworks_base that referenced this pull request May 4, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
anerikg pushed a commit to thelegorom/frameworks_base that referenced this pull request May 4, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
anerikg pushed a commit to thelegorom/frameworks_base that referenced this pull request May 4, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
anerikg pushed a commit to thelegorom/frameworks_base that referenced this pull request May 4, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
SeniorLimpio pushed a commit to SeniorLimpio/frameworks_base that referenced this pull request May 29, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
SeniorLimpio pushed a commit to SeniorLimpio/frameworks_base that referenced this pull request Jun 29, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
SeniorLimpio pushed a commit to SeniorLimpio/frameworks_base that referenced this pull request Aug 5, 2014
As per comment SlimRoms#5 in issue #25994:

The problem here is not that the state isn't saved and restored, the problem is how the BackStackRecord is rebuilt.  The ops themselves do save and restore the state, the problem is in BackStackRecord#addOp.

    void addOp(Op op) {
        if (mHead == null) {
            mHead = mTail = op;
        } else {
            op.prev = mTail;
            mTail.next = op;
            mTail = op;
        }
        op.enterAnim = mEnterAnim;
        op.exitAnim = mExitAnim;
        op.popEnterAnim = mPopEnterAnim;
        op.popExitAnim = mPopExitAnim;
        mNumOp++;
    }

The enter, exit, popEnter and popExit animations are overwritten with whatever is currently in the record, which during the restoration process these are 0 so the values which were saved in the ops is lost.

Change-Id: I095cc7ff4ae65581d728f34217fb873ad2f0c574
letmedanz added a commit to letmedanz2/frameworks_base that referenced this pull request Mar 14, 2015
- Patch SlimRoms#1: Remove Slim HeadsUp customizations

  **Patchset by @CPA-Poke <[email protected]> **

- Patch SlimRoms#2: HeadsUp Options (1/2)

  ** Patchset by @LinuxXxxX <[email protected]> **

  * Includes:
     * Base: forward port Headsup options (1/2)
     * Global on/off
     * Blacklist and Do not disturb
     * HeadsUp: fix settings not being applied after reboot
     * blacklist and dnd setting were not being applied at boot
     * clean up the SettingsObserver
     * Let user choose if headsup swype action hides or dimisses notification

- Patch SlimRoms#3: Frameworks: Actually start to use HEADS_UP_REQUESTED extra

  ** Patchset by @kufikugel **

- Patch SlimRoms#4: HeadsUp: add timeout option (1/2)

  ** Patchset by @kufikugel **

- Patch SlimRoms#5: HeadsUp: check if headsup is attached and not null when adding view

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#6: [Heads up swipe] Disable by default

  ** Patchset by @cristianomatos <[email protected]> **

- Patch SlimRoms#7: [Heads up] Add touch outside event

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#8: [Heads up] Touch outside to hide (1/2)

  ** Patchset by @cristianomatos <[email protected]> **

- Patch SlimRoms#9: HeadsUp: fix headsup for incoming calls

  ** Patchset by @Altaf-Mahdi **

- Patch SlimRoms#10: [Heads up] Don't show heads up while IME is showing

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#11: HeadsUp: Don't reset Y coordinate and improve edge
  swipe readability

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#12: Fix heads up dismiss not working

  ** Patchset by @cristianomatos <[email protected]> **

Change-Id: Id0e903d1f8c3040d0724dc59568332e99f346b84

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/statusbar/IStatusBar.aidl
	core/java/com/android/internal/statusbar/IStatusBarService.aidl
	core/res/res/values/liquid_strings.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/notification_guts.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/liquid_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
	services/core/java/com/android/server/statusbar/StatusBarManagerService.java

Conflicts:
	packages/SystemUI/res/values/config.xml
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
kagwind pushed a commit to kagwind/frameworks_base that referenced this pull request Mar 21, 2015
- Patch SlimRoms#1: Remove Slim HeadsUp customizations

  **Patchset by @CPA-Poke <[email protected]> **

- Patch SlimRoms#2: HeadsUp Options (1/2)

  ** Patchset by @LinuxXxxX <[email protected]> **

  * Includes:
     * Base: forward port Headsup options (1/2)
     * Global on/off
     * Blacklist and Do not disturb
     * HeadsUp: fix settings not being applied after reboot
     * blacklist and dnd setting were not being applied at boot
     * clean up the SettingsObserver
     * Let user choose if headsup swype action hides or dimisses notification

- Patch SlimRoms#3: Frameworks: Actually start to use HEADS_UP_REQUESTED extra

  ** Patchset by @kufikugel **

- Patch SlimRoms#4: HeadsUp: add timeout option (1/2)

  ** Patchset by @kufikugel **

- Patch SlimRoms#5: HeadsUp: check if headsup is attached and not null when adding view

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#6: [Heads up swipe] Disable by default

  ** Patchset by @cristianomatos <[email protected]> **

- Patch SlimRoms#7: [Heads up] Add touch outside event

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#8: [Heads up] Touch outside to hide (1/2)

  ** Patchset by @cristianomatos <[email protected]> **

- Patch SlimRoms#9: HeadsUp: fix headsup for incoming calls

  ** Patchset by @Altaf-Mahdi **

- Patch SlimRoms#10: [Heads up] Don't show heads up while IME is showing

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#11: HeadsUp: Don't reset Y coordinate and improve edge
  swipe readability

  ** Patchset by @bigbrother1984 <[email protected]> **

- Patch SlimRoms#12: Fix heads up dismiss not working

  ** Patchset by @cristianomatos <[email protected]> **

Change-Id: Id0e903d1f8c3040d0724dc59568332e99f346b84

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/statusbar/IStatusBar.aidl
	core/java/com/android/internal/statusbar/IStatusBarService.aidl
	core/res/res/values/liquid_strings.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/notification_guts.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/res/values/liquid_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
	services/core/java/com/android/server/statusbar/StatusBarManagerService.java

Conflicts:
	packages/SystemUI/res/values/config.xml
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
Thrilleratplay pushed a commit to Thrilleratplay/frameworks_base that referenced this pull request Jun 13, 2016
Add getPackageCandidateVolumesForceable() method
Flinny pushed a commit that referenced this pull request Oct 26, 2019
Change-Id: I04431625e922e9554ce55b852bd8ee571049339b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants