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

Commit 4e4b98d1 authored by Walter Jang's avatar Walter Jang Committed by android-build-merger
Browse files

Merge res-common resources with exising file in res 

am: 13a9c33a

Change-Id: I3b1532983fe25d97720eb4c35aa7d2e9323a70e0
parents 621adc09 13a9c33a

Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ support_library_root_dir := prebuilts/sdk/current/support 
endif

endif





src_dirs := src src-bind $(phone_common_dir)/src

src_dirs := src src-bind $(phone_common_dir)/src

res_dirs := res res-aosp res-common res-icons $(phone_common_dir)/res

res_dirs := res res-aosp res-icons $(phone_common_dir)/res

asset_dirs := assets

asset_dirs := assets





LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

res-common/values-land/integers.xml

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

<!--

  Copyright (C) 2012 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>

    <integer name="contact_tile_column_count_in_favorites">3</integer>



    <!-- The number of characters in the snippet before we need to tokenize and ellipse. -->

    <integer name="snippet_length_before_tokenize">60</integer>

</resources>

res-common/values-sw600dp-land/integers.xml

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

<!--

  Copyright (C) 2012 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>

    <integer name="contact_tile_column_count_in_favorites">3</integer>



    <!-- The number of characters in the snippet before we need to tokenize and ellipse. -->

    <integer name="snippet_length_before_tokenize">20</integer>

</resources>

res-common/values-sw600dp/dimens.xml

deleted100644 → 0
+0 −35
Original line number Original line Diff line number Diff line 
<!--

  ~ Copyright (C) 2012 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>

    <dimen name="detail_item_side_margin">0dip</dimen>



    <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding</dimen>

    <dimen name="contact_browser_list_header_right_margin">24dip</dimen>

    <dimen name="contact_browser_list_top_margin">16dip</dimen>



    <!-- End margin of the account filter header icon -->

    <dimen name="contact_browser_list_header_icon_right_margin">22dp</dimen>

    <dimen name="contact_browser_list_header_icon_right_margin_alt">24dp</dimen>



    <dimen name="contact_filter_list_item_padding_start">24dp</dimen>

    <dimen name="contact_filter_left_margin">16dp</dimen>



    <!-- Right margin of the floating action button -->

    <dimen name="floating_action_button_margin_right">32dp</dimen>

    <!-- Bottom margin of the floating action button -->

    <dimen name="floating_action_button_margin_bottom">32dp</dimen>

</resources>

res-common/values-sw600dp/integers.xml

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

<!--

  Copyright (C) 2012 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>

    <integer name="contact_tile_column_count_in_favorites">3</integer>



    <!-- The number of characters in the snippet before we need to tokenize and ellipse. -->

    <!-- Yikes, there is less space on a tablet!  This makes the search experience rather

         poor. Another reason to get rid of the exist tablet layout. -->

    <integer name="snippet_length_before_tokenize">15</integer>

</resources>