Kk4.4 #17
Open
Kk4.4 #17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change-Id: I08330a28d0880f82c09ccaec7e36844d9e6570d5 Conflicts: core/res/AndroidManifest.xml packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
This reverts commit 862138a.
Change-Id: I77e6aeca3667808e630dc142a2e561d3ddddef80
Change-Id: I32b884b032e0ddeb701103e361840559daea2a2b Conflicts: core/res/res/values/config.xml
Change-Id: I08330a28d0880f82c09ccaec7e36844d9e6570d5 Conflicts: core/java/android/app/INotificationManager.aidl core/res/AndroidManifest.xml packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java services/java/com/android/server/NotificationManagerService.java Conflicts: core/java/android/app/INotificationManager.aidl core/java/android/provider/Settings.java core/res/res/values/slim_symbols.xml packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java services/java/com/android/server/NotificationManagerService.java
This reverts commit dc8606b.
Change-Id: Id1d6baa2ab95ecf405c02c5d82732d1f545fc10a
PS1: Initial port Fix conficts with notification LED Fix derp Major derp HALO Mods Rebase Fix blackist, code clean and added some TODOs
PS2: Fix build
PS3: Fix bubble sometimes doesn't respond on new notification
PS4: Align halo icon
PS5: Keep floating app in recents and disable transparent layer temporarily (NOT INCLUDED)
PS6: Fix conflict after recent merges
PS7: Cosmetic fixes: Fix buttons layout in status bar. Status bar button holders show halo + qs switch on notification and qs edit mode + notification switch on qs. Update new margins size. (PARTIALY INCLUDED)
PS8: Rebase Clean white spaces Toggle on/off from notification shade icon (remove red X) Standardize behavior (remove option to reverse tap/double tap)
PS9: Remove references to LayerActivity
PS14: Rebase
PS15: update halo strings to prevent conflict with latest changes
PS16: Wrap all things! Modify halo behavior
PS17: Get the correct activity stack: this makes all windows in the same stack to get the floating mode
PS18: Stop pop-out on rotation
Catch "silent" notifications
PS19: Rebase
PS20: Rebase, fix conflicts with recent merges
PS21: Fix missing commit messages from previous undefined patchset (19) and other conflicts
Change-Id: I257b7109cc1efd146a1e7096143f45c4f9dc8f98
Conflicts:
packages/SystemUI/res/layout/status_bar_expanded_header.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Conflicts:
core/java/android/provider/Settings.java
packages/SystemUI/res/layout/status_bar_expanded_header.xml
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
services/java/com/android/server/NotificationManagerService.java
services/java/com/android/server/am/ActivityStack.java
Change-Id: Ic8aa1736d15924cf0deb9ecf7f4de8ec2f948734
Change-Id: I08330a28d0880f82c09ccaec7e36844d9e6570d5 Conflicts: core/java/android/app/INotificationManager.aidl core/res/AndroidManifest.xml packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java services/java/com/android/server/NotificationManagerService.java Conflicts: core/res/res/values/slim_symbols.xml
This reverts commit a5d899d.
Change-Id: I08330a28d0880f82c09ccaec7e36844d9e6570d5 Conflicts: core/java/android/app/INotificationManager.aidl core/res/AndroidManifest.xml packages/SystemUI/AndroidManifest.xml packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java services/java/com/android/server/NotificationManagerService.java Conflicts: core/res/res/values/slim_symbols.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
woops. didnt mean to do that