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

Commit 86b6357e authored by John Spurlock's avatar John Spurlock
Browse files

Manual f/b merge of lockhotness camera integration. 

Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f
parent 848a5557

core/res/res/layout/keyguard_camera_widget.xml

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

<!--

**

** Copyright 2009, 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.

*/

-->



<!-- This is a view that shows general status information in Keyguard. -->

<com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame

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

    android:id="@+id/keyguard_camera_widget"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_horizontal">



    <ImageView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:src="@drawable/camera_widget" />

    

</com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame>
 
 No newline at end of file

core/res/res/values-sw600dp/bools.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,4 +19,6 @@ 
    <bool name="show_ongoing_ime_switcher">true</bool>

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

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

    <!-- No camera for you, tablet user -->

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

</resources>

core/res/res/values/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<resources>

    <bool name="kg_enable_camera_default_widget">true</bool>

    <bool name="action_bar_embed_tabs">true</bool>

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

    <bool name="split_action_bar_is_narrow">true</bool>

core/res/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -3935,6 +3935,14 @@ 
       you will be asked to unlock your phone using an email account.\n\n

       Try again in <xliff:g id="number">%d</xliff:g> seconds.

    </string>

    <!-- Placeholder text shown if the camera widget layout is missing or invalid -->

    <string name="kg_camera_widget_not_found">Camera widget not found</string>

    <!-- DO NOT TRANSLATE. Context package to use when locating the camera widget -->

    <string name="kg_camera_widget_context_package">com.google.android.gallery3d</string>

    <!-- DO NOT TRANSLATE. Layout package to use when locating the camera widget -->

    <string name="kg_camera_widget_layout_package">com.android.gallery3d</string>

    <!-- DO NOT TRANSLATE. Layout name to use when locating the camera widget -->

    <string name="kg_camera_widget_layout_name">keyguard_widget</string>



    <!-- Message shown in dialog when user is attempting to set the music volume above the

    recommended maximum level for headphones -->

core/res/res/values/symbols.xml

+5 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,6 @@ 
  <java-symbol type="layout" name="keyguard_multi_user_selector_widget" />

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

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

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



  <java-symbol type="anim" name="slide_in_child_bottom" />

  <java-symbol type="anim" name="slide_in_right" />
@@ -1192,6 +1191,7 @@ 
  <java-symbol type="bool" name="config_lidControlsSleep" />

  <java-symbol type="bool" name="config_reverseDefaultRotation" />

  <java-symbol type="bool" name="config_showNavigationBar" />

  <java-symbol type="bool" name="kg_enable_camera_default_widget" />

  <java-symbol type="bool" name="kg_share_status_area" />

  <java-symbol type="bool" name="kg_sim_puk_account_full_screen" />

  <java-symbol type="bool" name="target_honeycomb_needs_options_menu" />
@@ -1381,6 +1381,10 @@ 
  <java-symbol type="string" name="keyguard_password_enter_pin_code" />

  <java-symbol type="string" name="keyguard_password_enter_puk_code" />

  <java-symbol type="string" name="keyguard_password_wrong_pin_code" />

  <java-symbol type="string" name="kg_camera_widget_context_package" />

  <java-symbol type="string" name="kg_camera_widget_layout_name" />

  <java-symbol type="string" name="kg_camera_widget_layout_package" />

  <java-symbol type="string" name="kg_camera_widget_not_found" />

  <java-symbol type="string" name="lockscreen_carrier_default" />

  <java-symbol type="string" name="lockscreen_charged" />

  <java-symbol type="string" name="lockscreen_failed_attempts_almost_at_wipe" />