Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 501017eb authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 7e2181c0 to master"

parents 0d780ae8 3fc1f85a

packages/SystemUI/res/values-sw600dp-port/config.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2011, 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="config_maxNotificationIcons">3</integer>

</resources>

packages/SystemUI/res/values-sw600dp-port/dimens.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2010, The Android Open Source Project

 * Copyright (c) 2011, 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.
@@ -17,6 +17,6 @@ 
-->

<resources>

    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_padding">2dp</dimen>

    <dimen name="status_bar_icon_padding">0dp</dimen>

</resources>

packages/SystemUI/res/values-sw720dp-port/dimens.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2011, 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>

    <!-- gap on either side of status bar notification icons -->

    <dimen name="status_bar_icon_padding">2dp</dimen>

</resources>

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2011, 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="config_maxNotificationIcons">5</integer>

</resources>

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -40,5 +40,8 @@ 
         autodetected from the Configuration. -->

    <bool name="config_showNavigationBar">false</bool>



    <!-- How many icons may be shown at once in the system bar. Includes any

         slots that may be reused for things like IME control. -->

    <integer name="config_maxNotificationIcons">5</integer>

</resources>