Merge "Use screen height to determine # of QS rows." into pi-dev am: 9376380a27 (bc74545d) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values-h320dp/config.xml

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (c) 2017, 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>
		<!-- The number of rows in the QuickSettings -->
		<integer name="quick_settings_num_rows">2</integer>
		</resources>

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (c) 2017, 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>
		<!-- The number of rows in the QuickSettings -->
		<integer name="quick_settings_num_rows">3</integer>
		</resources>

+0 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,5 @@
		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->
		<resources>
		<integer name="quick_settings_num_rows">2</integer>
		<integer name="quick_settings_num_rows_portrait">3</integer>

		<bool name="quick_settings_show_full_alarm">true</bool>
		</resources>

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2016, 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.
		*/
		-->

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->
		<resources>
		<integer name="quick_settings_num_rows">3</integer>
		</resources>

+0 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@

		<!-- The number of rows in the QuickSettings -->
		<integer name="quick_settings_num_rows">1</integer>
		<integer name="quick_settings_num_rows_portrait">2</integer>

		<!-- The number of columns that the top level tiles span in the QuickSettings -->
		<integer name="quick_settings_user_time_settings_tile_span">1</integer>