Loading core/java/com/android/internal/widget/ButtonBarLayout.java +9 −1 Original line number Diff line number Diff line Loading @@ -30,6 +30,10 @@ import com.android.internal.R; * orientation when it can't fit its child views horizontally. */ public class ButtonBarLayout extends LinearLayout { // Whether to allow vertically stacked button bars. This is disabled for // configurations with a small (e.g. less than 320dp) screen height. --> private static final int ALLOW_STACKING_MIN_HEIGHT_DP = 320; /** Whether the current configuration allows stacking. */ private boolean mAllowStacking; Loading @@ -38,8 +42,12 @@ public class ButtonBarLayout extends LinearLayout { public ButtonBarLayout(Context context, AttributeSet attrs) { super(context, attrs); final boolean allowStackingDefault = context.getResources().getConfiguration().screenHeightDp >= ALLOW_STACKING_MIN_HEIGHT_DP; final TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.ButtonBarLayout); mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking, false); mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking, allowStackingDefault); ta.recycle(); } Loading core/res/res/layout/alert_dialog_button_bar_material.xml +0 −1 Original line number Diff line number Diff line Loading @@ -27,7 +27,6 @@ android:paddingTop="4dp" android:paddingBottom="4dp" android:gravity="bottom" android:allowStacking="@bool/allow_stacked_button_bar" style="?attr/buttonBarStyle"> <Button Loading core/res/res/values-h320dp/bools.xmldeleted 100644 → 0 +0 −20 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <resources> <bool name="allow_stacked_button_bar">true</bool> </resources> core/res/res/values/bools.xml +0 −4 Original line number Diff line number Diff line Loading @@ -25,8 +25,4 @@ <bool name="show_ongoing_ime_switcher">true</bool> <bool name="action_bar_expanded_action_views_exclusive">true</bool> <bool name="target_honeycomb_needs_options_menu">true</bool> <!-- Whether to allow vertically stacked button bars. This is disabled for configurations with a small (e.g. less than 320dp) screen height. --> <bool name="allow_stacked_button_bar">false</bool> </resources> core/res/res/values/symbols.xml +0 −1 Original line number Diff line number Diff line Loading @@ -2321,7 +2321,6 @@ <java-symbol type="string" name="lockscreen_access_pattern_area" /> <java-symbol type="bool" name="allow_stacked_button_bar" /> <java-symbol type="bool" name="config_eap_sim_based_auth_supported" /> <java-symbol type="array" name="config_cell_retries_per_error_code" /> Loading Loading
core/java/com/android/internal/widget/ButtonBarLayout.java +9 −1 Original line number Diff line number Diff line Loading @@ -30,6 +30,10 @@ import com.android.internal.R; * orientation when it can't fit its child views horizontally. */ public class ButtonBarLayout extends LinearLayout { // Whether to allow vertically stacked button bars. This is disabled for // configurations with a small (e.g. less than 320dp) screen height. --> private static final int ALLOW_STACKING_MIN_HEIGHT_DP = 320; /** Whether the current configuration allows stacking. */ private boolean mAllowStacking; Loading @@ -38,8 +42,12 @@ public class ButtonBarLayout extends LinearLayout { public ButtonBarLayout(Context context, AttributeSet attrs) { super(context, attrs); final boolean allowStackingDefault = context.getResources().getConfiguration().screenHeightDp >= ALLOW_STACKING_MIN_HEIGHT_DP; final TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.ButtonBarLayout); mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking, false); mAllowStacking = ta.getBoolean(R.styleable.ButtonBarLayout_allowStacking, allowStackingDefault); ta.recycle(); } Loading
core/res/res/layout/alert_dialog_button_bar_material.xml +0 −1 Original line number Diff line number Diff line Loading @@ -27,7 +27,6 @@ android:paddingTop="4dp" android:paddingBottom="4dp" android:gravity="bottom" android:allowStacking="@bool/allow_stacked_button_bar" style="?attr/buttonBarStyle"> <Button Loading
core/res/res/values-h320dp/bools.xmldeleted 100644 → 0 +0 −20 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2015 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <resources> <bool name="allow_stacked_button_bar">true</bool> </resources>
core/res/res/values/bools.xml +0 −4 Original line number Diff line number Diff line Loading @@ -25,8 +25,4 @@ <bool name="show_ongoing_ime_switcher">true</bool> <bool name="action_bar_expanded_action_views_exclusive">true</bool> <bool name="target_honeycomb_needs_options_menu">true</bool> <!-- Whether to allow vertically stacked button bars. This is disabled for configurations with a small (e.g. less than 320dp) screen height. --> <bool name="allow_stacked_button_bar">false</bool> </resources>
core/res/res/values/symbols.xml +0 −1 Original line number Diff line number Diff line Loading @@ -2321,7 +2321,6 @@ <java-symbol type="string" name="lockscreen_access_pattern_area" /> <java-symbol type="bool" name="allow_stacked_button_bar" /> <java-symbol type="bool" name="config_eap_sim_based_auth_supported" /> <java-symbol type="array" name="config_cell_retries_per_error_code" /> Loading