OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7d7699
b18f65a
)
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
author
Selim Cinek
<cinek@google.com>
Thu, 8 Jun 2017 14:15:29 +0000
(14:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 8 Jun 2017 14:15:29 +0000
(14:15 +0000)
am:
b18f65a168
Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
1
2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationViewWrapper.java
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java
Simple merge
diff --cc
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
Simple merge
OSDN Git Service
