update Japanese translations
update Japanese translations
Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
Add back increasing ring feature (2/3).

Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be
Settings: Add Advanced reboot (1 of 2)

This commit adds a setting in Development settings for including options
in the power menu for rebooting into recovery or bootloader, defauled to
off.

When enabled, the Advanced reboot options will only be available once the
device is unlocked.

Change-Id: Ib77f0be178d15131b99adbe0abb6ba18b2b7c0b6

From: jackmu95 <jacob.mueller.elz@gmail.com>
Settings: Move 'Advanced reboot' to other position

This commit moves the 'Advanced reboot' checkbox one item down
because it looks a bit strange as first element in the list IMHO.

Before: http://goo.gl/jhw8h
After:  http://goo.gl/X3H68

Change-Id: I26d4a5caba3e720b952ec405e200c1528f7a7321

From: ThiagoVinicius <thiagovfar@gmail.com>
Development Settings: fix setting reset on disable

When Development Settings are disabled, some settings are
reset to values other than the default. This fixes it.

 - No need to have resetAdvancedReboot(), as it is already
   reset by the "unckeck all checkboxes" logic.

Change-Id: If5d88d220d2a17d6e172b2f54facd4afa3bae904
Port "Option to hide Adb notification icon (1/2)"

Frameworks part is already in place

Change-Id: Ie65625305153b45012846f6d2250fb707c4eebfd
Settings: Forward port long-press-back to kill app (1/2)

Change-Id: I60f4b95eb9cc2ef6cf73a5f9317bca066e6bb901
Display Settings: Better font size control

Use a SeekBar instead of a list/spinner to determine the font scaling.
For consistency, an approximate size (small, normal, etc.)
 and the exact percentage are displayed.
Show a preview of the selected font size immediately

Ported from CM 10.2, squashed commits 46678 and 49167.
Credit to Veeti Paaananen for the latter commit.

Change-Id: I754d7fdcaf27c23dfccf9d56291956e70b23f63e

Conflicts:
	res/values/mahdi_attrs.xml
	res/values/mahdi_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Settings: Use a seekbar preference to allow setting arbitrary animation scale values
(2/2) Settings: allow to configure the long press back kill delay

Change-Id: I1aeb40351e2ec2ab6f88df51ae33d8bc4ed87275
Port "Option to control cursor in text fields using volume keys (2/2)"

Change-Id: I577e2d200c9da9d86db4f4892a60851978c9509e

Conflicts:
	res/values/custom_strings.xml
[2/2] settings: add CPU info overlay

this shows
CPU temp (if available)
for every core governor + online + freq

Change-Id: I28c1e48c2e613b33c301b61cead70678ab6a2e9b

Conflicts:
	res/values/custom_strings.xml
Update drawables for Blacklist and PrivacyGuard

-also update update Profiles and PrivacyGuard dashboard icons
Profiles: fix pager strip color
Settings: Fix wifi developer options summaries

Change-Id: I85688d59685d3a0b0a48e51581eee77ebc7cd2fa
Settings: Hide Development settings when it is turned off

This commit hides the Development and Performance settings items
when the user turns off Development settings. This sets things back
to tapping x number of times on the build number to once again enable
developer settings

Change-Id: I6003f73f5abee54bb000f01757ecffe7b68dba59
Development Settings: fix setting reset on disable

When Development Settings are disabled, some settings are
reset to values other than the default. This fixes it.

 - Adb notify should reset to enabled

 - Verify apps over usb should reset to enabled

Change-Id: Ifa1ee25cfab32b7a236e02055006f0d2a4b07f37
Fix NPE.

When entering the notification prefs sub activity without the increasing
ring pref being visible and leaving it right away, onActivityStop()
threw an NPE because the handler wasn't yet constructed.

Change-Id: Ia4291d8ac3d1dbf76d432db7e0e973844163c4ae
Add an option to change the device hostname (2/2).

This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.

Change-Id: Ibc145b74036617248d4f33c6866cc9c8a8cc8974
[2/2] Settings: Battery and Notification Lights

PS2: *) Move menu options to sounds and notification
     *) Remove samm debug cruft

PS5: *) Update UI

Put together from:

Author: DvTonder <david.vantonder@gmail.com>
Date:   Fri Apr 6 07:39:11 2012 -0400

    Settings: Notification light(LED) settings

    This commit adds the ability to configure the Notification light
    color and pulse rate both for the default and a custom applications
    list.

    This work was done in collaboration with Marko Mihovilić (m1h4) who
    wrote the initial implementation as a stand-alone application and
    helped with the fixes below.

    NOTE: Google Talk notifications originate from the "Google Services
    Framework" so in order to override their settings you need to add
    this package instead of the Google Talk package.

    Change-Id: I6837210367123bc02ea27a9b7b6b3cf80c738bf1

Author: Danny Baumann <dannybaumann@web.de>
Date:   Thu Nov 7 09:04:29 2013 +0100
Add back notification light settings.
Change-Id: I474a14a1b395407f5ca273a5d6a3a7f03f7e4698

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sat Jan 4 15:52:47 2014 -0800
Settings: fix led pulsespeedoff disable behaviour
Keep led pulsespeedoff disabled if pulsespeedon is
disabled.  This ensures that pulsespeedoff stays
disabled if onOffChangeable was set to false.  Fixes
problem where charged led pulsespeed off looks to
be configurable in the ui and thereby creating user
confusion.
Change-Id: I6ac7f630544bf719b39e1ddcab435322975430c8

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Tue Dec 31 12:11:05 2013 -0800
[1/2] Settings: instant led test
Show LED color in realtime when configuring
notification colors.
Requires framework patch for notification
extra EXTRA_FORCE_SHOW_LIGHTS.
Change-Id: Ic7858d79cb2351c407afd547b33652a9e04ef1b9

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sat Feb 1 18:36:15 2014 -0800
Settings LightSettingsDialog: update led on text change
Change-Id: I135f37829b9b4fb2166afac9d9531b76a62f3ef7

Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Jun 25 08:56:17 2014 +0200
Deduplicate adapter-of-installed-packages code.
Change-Id: I454ba79eddaaff86233a2cc341f4c8bebe94729e

Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Fri Oct 17 00:48:17 2014 +0300
Fix copyright headers
Change-Id: I7934d01f89953e577c3cb074dce608d9bedd4027

Author: Michael Bestas <mikeioannina@gmail.com>
Date:   Wed Oct 22 02:23:15 2014 +0300
Add support for single color notification LED (2/2)
Change-Id: I4cf21dda3d9e311146149c2ec81fe2398f5f9f87

Change-Id: Ie1203c64484c7d9bed0a6bc0b2808e69ef4bfa35

Conflicts:
	res/values/cm_strings.xml