Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Global actions visuals:" into pi-dev

Browse Source 
am: a52c08a7af

Change-Id: I15d0ca8dbd65421d9cc54ed930937d9864dcde49
This commit is contained in:
Alison Cichowlas
2018-04-23 12:13:22 -07:00
committed by android-build-merger
parent 742c26c07e a52c08a7af
commit ce0300fbe3
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/layout/global_actions_item.xml
View File

@@ -13,6 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<!-- Used with LegacyGlobalActions. -->
<!-- RelativeLayouts have an issue enforcing minimum heights, so just <!-- RelativeLayouts have an issue enforcing minimum heights, so just
work around this for now with LinearLayouts. --> work around this for now with LinearLayouts. -->

4
packages/SystemUI/res/layout/global_actions_item.xml
View File

@@ -25,8 +25,8 @@
android:minHeight="92dp" android:minHeight="92dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="0dip" android:paddingEnd="4dip"
android:paddingStart="0dip"> android:paddingStart="4dip">
<ImageView <ImageView
android:id="@*android:id/icon" android:id="@*android:id/icon"

2
packages/SystemUI/res/layout/global_actions_wrapped.xml
View File

@@ -17,7 +17,7 @@
android:layout_gravity="top|right" android:layout_gravity="top|right"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp" android:padding="12dp"
android:translationZ="9dp" /> android:translationZ="9dp" />
</com.android.systemui.HardwareUiLayout> </com.android.systemui.HardwareUiLayout>

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -899,8 +899,6 @@
<dimen name="default_gear_space">18dp</dimen> <dimen name="default_gear_space">18dp</dimen>
<dimen name="cell_overlay_padding">18dp</dimen> <dimen name="cell_overlay_padding">18dp</dimen>
<dimen name="hwui_edge_margin">16dp</dimen>
<dimen name="global_actions_panel_width">120dp</dimen> <dimen name="global_actions_panel_width">120dp</dimen>
<dimen name="global_actions_top_padding">120dp</dimen> <dimen name="global_actions_top_padding">120dp</dimen>
@@ -916,7 +914,7 @@
<dimen name="corner_size">8dp</dimen> <dimen name="corner_size">8dp</dimen>
<dimen name="top_padding">0dp</dimen> <dimen name="top_padding">0dp</dimen>
<dimen name="bottom_padding">48dp</dimen> <dimen name="bottom_padding">48dp</dimen>
<dimen name="edge_margin">16dp</dimen> <dimen name="edge_margin">8dp</dimen>
<dimen name="rounded_corner_radius">0dp</dimen> <dimen name="rounded_corner_radius">0dp</dimen>
<dimen name="rounded_corner_content_padding">0dp</dimen> <dimen name="rounded_corner_content_padding">0dp</dimen>

2
packages/SystemUI/src/com/android/systemui/HardwareUiLayout.java
View File

@@ -89,7 +89,7 @@ public class HardwareUiLayout extends FrameLayout implements Tunable {
mEdgeBleed = Settings.Secure.getInt(getContext().getContentResolver(), mEdgeBleed = Settings.Secure.getInt(getContext().getContentResolver(),
EDGE_BLEED, 0) != 0; EDGE_BLEED, 0) != 0;
mRoundedDivider = Settings.Secure.getInt(getContext().getContentResolver(), mRoundedDivider = Settings.Secure.getInt(getContext().getContentResolver(),
ROUNDED_DIVIDER, 1) != 0; ROUNDED_DIVIDER, 0) != 0;
updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding()); updateEdgeMargin(mEdgeBleed ? 0 : getEdgePadding());
mBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext()); mBackground = new HardwareBgDrawable(mRoundedDivider, !mEdgeBleed, getContext());
if (mChild != null) { if (mChild != null) {