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

Commit 6a045ca1 authored by Joe Onorato's avatar Joe Onorato
Browse files

Merge commit 'fce12613' into HEAD

Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
parents 3a4b8bb6 fce12613
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/dimens.xml
**
** Copyright 2006, 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>
    <!-- Height of the status bar -->
    <dimen name="status_bar_height">48dip</dimen>
    <!-- Width and height of a single notification icon in the status bar -->
    <dimen name="status_bar_icon_size">32dip</dimen>
    <!-- Size of the giant number (unread count) in the notifications -->
    <dimen name="status_bar_content_number_size">48sp</dimen>
</resources>
+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@
*/
-->
<resources>
    <!-- Height of the status bar -->
    <dimen name="status_bar_height">48dip</dimen>
    <!-- Width and height of a single notification icon in the status bar -->
    <dimen name="status_bar_icon_size">32dip</dimen>
    <!-- Size of the giant number (unread count) in the notifications -->
    <dimen name="status_bar_content_number_size">48sp</dimen>

    <!-- Default height of a key in the password keyboard for alpha -->
    <dimen name="password_keyboard_key_height_alpha">75dip</dimen>
    <!-- Default height of a key in the password keyboard for numeric -->