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

Commit ddb12e84 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev

parents 0a266965 e46efc04

core/res/res/layout-land/keyguard_host_view.xml

+1 −6
Original line number Diff line number Diff line
@@ -45,13 +45,8 @@ 
        android:layout_weight="1"

        android:gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

        <include layout="@layout/keyguard_selector_view"/>

        <include layout="@layout/keyguard_account_view"/>

        <include layout="@layout/keyguard_pattern_view"/>

        <include layout="@layout/keyguard_password_view"/>

        <include layout="@layout/keyguard_sim_pin_view"/>

        <include layout="@layout/keyguard_sim_puk_view"/>

        <include layout="@layout/keyguard_face_unlock_view"/>



    </ViewFlipper>

core/res/res/layout-port/keyguard_host_view.xml

+1 −6
Original line number Diff line number Diff line
@@ -33,13 +33,8 @@ 
        android:layout_height="match_parent"

        android:gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

        <include layout="@layout/keyguard_selector_view"/>

        <include layout="@layout/keyguard_account_view"/>

        <include layout="@layout/keyguard_pattern_view"/>

        <include layout="@layout/keyguard_password_view"/>

        <include layout="@layout/keyguard_sim_pin_view"/>

        <include layout="@layout/keyguard_sim_puk_view"/>

        <include layout="@layout/keyguard_face_unlock_view"/>



    </ViewFlipper>

core/res/res/layout-sw600dp-land/keyguard_host_view.xml

+1 −6
Original line number Diff line number Diff line
@@ -52,13 +52,8 @@ 
            android:layout_weight="1"

            android:gravity="center">



            <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

            <include layout="@layout/keyguard_selector_view"/>

            <include layout="@layout/keyguard_account_view"/>

            <include layout="@layout/keyguard_pattern_view"/>

            <include layout="@layout/keyguard_password_view"/>

            <include layout="@layout/keyguard_sim_pin_view"/>

            <include layout="@layout/keyguard_sim_puk_view"/>

            <include layout="@layout/keyguard_face_unlock_view"/>



        </ViewFlipper>

core/res/res/layout-sw600dp-port/keyguard_host_view.xml

+1 −6
Original line number Diff line number Diff line
@@ -47,13 +47,8 @@ 
        android:layout_weight="0.6"

        android:layout_gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

        <include layout="@layout/keyguard_selector_view"/>

        <include layout="@layout/keyguard_account_view"/>

        <include layout="@layout/keyguard_pattern_view"/>

        <include layout="@layout/keyguard_password_view"/>

        <include layout="@layout/keyguard_sim_pin_view"/>

        <include layout="@layout/keyguard_sim_puk_view"/>

        <include layout="@layout/keyguard_face_unlock_view"/>



    </ViewFlipper>

core/res/res/values/public.xml

+7 −0
Original line number Diff line number Diff line
@@ -1367,6 +1367,13 @@ 
  <java-symbol type="layout" name="keyguard_screen_tab_unlock_land" />

  <java-symbol type="layout" name="keyguard_screen_unlock_landscape" />

  <java-symbol type="layout" name="keyguard_screen_unlock_portrait" />

  <java-symbol type="layout" name="keyguard_selector_view" />

  <java-symbol type="layout" name="keyguard_pattern_view" />

  <java-symbol type="layout" name="keyguard_password_view" />

  <java-symbol type="layout" name="keyguard_face_unlock_view" />

  <java-symbol type="layout" name="keyguard_sim_pin_view" />

  <java-symbol type="layout" name="keyguard_sim_puk_view" />

  <java-symbol type="layout" name="keyguard_account_view" />

  <java-symbol type="layout" name="recent_apps_dialog" />

  <java-symbol type="layout" name="screen_action_bar" />

  <java-symbol type="layout" name="screen_action_bar_overlay" />