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:
ffd354d
bd7e0df
)
Merge "Sharesheet - add label loading placeholder" into qt-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Wed, 24 Apr 2019 22:59:28 +0000
(22:59 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 24 Apr 2019 22:59:28 +0000
(22:59 +0000)
1
2
core/java/com/android/internal/app/ChooserActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/dimens.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/app/ChooserActivity.java
Simple merge
diff --cc
core/res/res/values/dimens.xml
index
f2ac755
,
0b3ad59
..
167e672
---
1
/
core/res/res/values/dimens.xml
---
2
/
core/res/res/values/dimens.xml
+++ b/
core/res/res/values/dimens.xml
@@@
-729,6
-734,6
+729,7
@@@
<dimen name="resolver_icon_size">42dp</dimen>
<dimen name="resolver_badge_size">18dp</dimen>
<dimen name="chooser_target_width">90dp</dimen>
+ <dimen name="chooser_header_scroll_elevation">4dp</dimen>
<dimen name="chooser_max_collapsed_height">288dp</dimen>
+ <dimen name="chooser_direct_share_label_placeholder_max_width">72dp</dimen>
</resources>
diff --cc
core/res/res/values/symbols.xml
Simple merge