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

Commit 2e8a98e2 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev

parents e3b51ef0 dcc9681b

core/res/res/drawable-hdpi/camera_widget.png

deleted100644 → 0
−1.22 MiB
Loading image diff...

core/res/res/drawable-mdpi/camera_widget.png

deleted100644 → 0
−1.22 MiB
Loading image diff...

core/res/res/drawable-xhdpi/camera_widget.png

deleted100644 → 0
−1.22 MiB
Loading image diff...

core/res/res/values/strings.xml

+0 −8
Original line number Diff line number Diff line
@@ -3935,14 +3935,6 @@ 
       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

+0 −4
Original line number Diff line number Diff line
@@ -1383,10 +1383,6 @@ 
  <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" />