Settings: Fix value from being overwritten with null.

After awhile this value becomes null for unknown reasons.
Switch back to a non-changing static final for the non-multi-sim case.

Change-Id: I9248a545ed35ec10048781b21a3e6a6b17e96d74
Merge remote-tracking branch 'PA/kitkat' into remix-legacy
Center Lockscreen targets

Change-Id: If99b0b7bf7ac4507076b9806e8208bab77fb71a2
Revert "[2/3]Quiet Hours"

This reverts commit 8a202029be0b528c4d1b6499126e7743590bd552.

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/paranoid/QuietHours.java
	src/com/android/settings/paranoid/service/SmsCallHelper.java
Merge remote-tracking branch 'aospal/kitkat-remix' into kitkat-remix
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	AndroidManifest.xml
	res/values/pa_strings.xml
	src/com/android/settings/SoundSettings.java
czech translation - string fix
settings: Put MSIM files in the right place

Change-Id: I1e989d710510aff257f5ae3f6f402bb993b8da72
Settings: Day and week on data usage cycle (2/2)

Adds the ability to set day and week on when the data usage graph resets, instead of just month.

Change-Id: I5974e1b7143d09ffd6fcd6db113c3f7511346bfa

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Settings: Add preference for EdgeGesture service.

Update: Default to true

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4

Conflicts:
	res/values/cm_strings.xml
Merge remote-tracking branch 'PA/kitkat' into remix-legacy
Live Volume Steps [2/2]

-Volume steps changes are instant, no need to reboot!

LiveVolumeSteps: transitioned volume steps volume normalization.

-This calculates an equivalent volume ratio for the new
volume steps.
-example: Volume steps are set at 60. Volume is set at 5. That is
very low volume. Then volume steps are switched to 5. Now you
are instantly in a state were your volume steps are 5 and your
volume is 5. That's full volume! This fixes that issue.
-So it basically keeps the volume from jumping around while your
changing volume steps. It may be a little lower but should be
very close.

Change-Id: I4ca587e0bd3eed381e019023176cfce3ec5c0b80
Signed-off-by: STELIX <ssspinni@gmail.com>
Merge branch 'kitkat-remix' of github.com:AOSPAL/android_packages_apps_Settings into kitkat-remix
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	src/com/android/settings/SoundSettings.java
Fix resource IDs being added to the android namespace

Using @+android:id/some_id will create a new resource ID
with package ID 0x01 rather than 0x7f, for non framework
packages, if "some_id" does not already exist.

Change-Id: I86d57ae6ac88e7dae8420a92e4d55b6c935fd188

Conflicts:
	res/layout/preference_streamvolume.xml
Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	res/layout/data_usage_cycle_editor.xml
	res/values/cm_strings.xml
	src/com/android/settings/DataUsageSummary.java
	src/com/android/settings/net/NetworkPolicyEditor.java
Fix build
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy
Volume steps: cleanup & move to its own preference

PS3: Properly given a proper preference
PS4-5: Missing components fixes

Change-Id: I0e33443ec0efd14e9876c2555ab59aedec66f901
Signed-off-by: Daniel MM <daxx4182@gmail.com>

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/SoundSettings.java
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy