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

Commit dfaccf64 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Various icon size changes 

1) Setting different icon and text size for workspace and all apps
2) Setting padding during BubbleTextView inflation

Change-Id: I59da6986b0d98e8e2aa6065743bb799a6bf06a37
parent 1d7a5566

res/layout/apps_customize_application.xml

deleted100644 → 0
+0 −21
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.

-->



<com.android.launcher3.BubbleTextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/WorkspaceIcon.AppsCustomize"

    android:id="@+id/application_icon"

    android:focusable="true" />

res/layout/apps_grid_row_icon_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,5 +25,6 @@ 
    android:paddingBottom="8dp"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    launcher:deferShadowGeneration="true" />

    launcher:deferShadowGeneration="true"

    launcher:iconDisplay="all_apps" />

res/layout/apps_list_row_icon_view.xml

deleted100644 → 0
+0 −29
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.

-->



<com.android.launcher3.BubbleTextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    style="@style/WorkspaceIcon.AppsCustomize"

    android:id="@+id/application_icon"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    launcher:iconPaddingOverride="24dp"

    launcher:textSizeOverride="16dp"

    launcher:layoutHorizontal="true"

    launcher:deferShadowGeneration="true" />

res/layout/apps_list_row_view.xml

deleted100644 → 0
+0 −33
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.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/apps_view_row_height"

    android:orientation="horizontal"

    android:focusable="true"

    android:background="@drawable/focusable_view_bg"

    android:descendantFocusability="afterDescendants">

    <TextView

        android:id="@+id/section"

        android:layout_width="64dp"

        android:layout_height="match_parent"

        android:paddingLeft="16dp"

        android:gravity="start|center_vertical"

        android:textColor="@color/apps_view_section_text_color"

        android:textSize="@dimen/apps_view_section_text_size"

        android:focusable="false" />

</LinearLayout>

res/values/attrs.xml

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ 
    <declare-styleable name="BubbleTextView">

        <attr name="layoutHorizontal" format="boolean" />

        <attr name="iconSizeOverride" format="dimension" />

        <attr name="iconPaddingOverride" format="dimension" />

        <attr name="textSizeOverride" format="dimension" />

        <attr name="iconDisplay" format="integer">

            <enum name="workspace" value="0" />

            <enum name="all_apps" value="1" />

        </attr>

        <attr name="deferShadowGeneration" format="boolean" />

        <attr name="customShadows" format="boolean" />

    </declare-styleable>