Merge CM

[+]
Automatic translation import

Change-Id: I79229f7208d13209d6fc2ea9ac1594027279ab0f

[+]
[1/2] Add option to change size of QS ribbon bar

PS2: Use narrow for 2nd size
PS3: Rebase
PS4: Change narrow to automatic
PS5: Rename small to narrow

Change-Id: Ibdf37b667b54ca598bc133b89ae01a504bfac883

[+]
Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173

[+]
Add summary to notification filtering

Change-Id: Ie02165f72e67b2fc6aa086de61303a53a7ee4470

[+]
Settings: Don't show protected apps options in restricted profiles.

Change-Id: I38c2e8fd3508d360f0e23703ce6c939f02f3714e
JIRA: 4668
Issue: https://jira.cyanogenmod.org/browse/CYAN-4668

[+]
Cleanup.

Now that button and keyboard backlight don't use the HW framework
anymore, there's no point in having an abstraction for a single use case.

Change-Id: Ib66b2a29a105d53e3ba4273abb06977b132c1fc8

[+]
Settings: Modify AOSP EL translations

Change-Id: I7e3a59412a2884c26a5eb165676e381d003f0fca

[+]
Settings: Fix the failing strings

Change-Id: I93865d793eef711f8738e00e843e9d4670724c66

[+]
Settings: Add option to scramble pin layout when unlocking (1/2).

Change-Id: I3e2c200a0a31d3c765831bc30280029a50c88051

Conflicts:
	res/values/cm_strings.xml

[+]
Improve notification spam filter code.

- Follow coding style guidelines
- Replace dialog shown on click by adding the relevant information and
  the delete button to the item itself
- Minor layout tweaks
- Make the empty view more descriptive
- Add license headers

Change-Id: Ic685364087d6a093fdbb6a143a9c6ed78596b62b

[+]
Automatic translation import

Change-Id: I1f9fc1e3a15c77fd725c3cae8ab619199cdfe04a

Conflicts:
	res/values-ku/cm_strings.xml
	res/values-th/cm_arrays.xml

[+]
Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec

[+]
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1

[+]
Fix: Even when the list is entirely unchecked there may still be components
which are still protected and need to cleared when Reset is triggered.

https://jira.cyanogenmod.org/browse/BACON-679
https://jira.cyanogenmod.org/browse/CYAN-4835

Change-Id: Ifee3e8b87be39769aedfed0f9a5bda366c67ee45

[+]
ProtectedApps pattern lock for landscape mode.

Change-Id: I9ef70a0e363d4d17510188d24f4742f458fba38e

[+]
Fix keyboard opening on pattern entry.

For protected apps, on some devices (consistent repro on flo), the soft
keyboard will open every time you enter the LockPatternActivity. Fix
this by setting the keyboard state to hidden in the manifest for this
activity.

Change-Id: I56fb6644cacd7a05100199637b1a27159ca04829

[+]
Wifi Country code

Change-Id: Ic57d5f86e63e0fadd69d98c282a1e81360d5c6ae

[+]
Settings: Update a string.

User's won't know what Zygote is.

Change-Id: Idf46bfd7c9352adc77def0fab7192fde7a27e803

[+]
Settings: remove Expanded Desktop from Power Menu if unavailable

Instead of disabling the option when it is disabled, let's remove the
Expanded Desktop option in Power Menu Settings.

When the user toggles Expanded Desktop to ON, it will automatically add
the option to the power menu. The user can then remove it if they wish,
and all the states are properly kept.

Change-Id: I23b6a44da86c1cd74e3f73a8edc714ceeb47af4d
Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Settings: use ActivityManager method for requesting bug report

This let's ActivityManagerService handle all the logic for requesting
bug reports.

Change-Id: I44e6a9295a0625bcdc0f3a22daf097bdccf0d3c4
Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Settings: fix Wifi/WifiAP tile inconsistency

While editing tiles, remove Wifi tile, add Wifi AP tile. Then if you try
and add the Wifi tile, it is disabled.

The logic was checking whether "toggleWifi" existed in the quick tile
string, which it did, as "toggleWifiAp".

Change-Id: I0663c06bef6365315aa979fcff228aeb679b41d0
Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Automatic translation import

Change-Id: Ifd9cd0dce984e26560a9f03edafa7d625f018cfc

[+]
settings: Add support for SRE

 * Add support for sunlight readability enhancement
 * Optionally depends on adaptive backlight, depending on HAL

Change-Id: I9ca388ffd68080f0e497edb81d5f8616c194ea1d

[+]
Revert "Allow changing theme to Holo.Light without crashing"

http://review.cyanogenmod.org/#/c/70745/ solves the issue
that this patch originally was created for.

This reverts commit 8cc23d58abc4874fe049a8dfa70910cf0b5dd9b2.

Change-Id: Ia350a03749202a2c0ae809400a3ebb554551d601

[+]
Settings: Remove leftover from old theme chooser

Change-Id: Iaf97e2b94c27839eb4f9827a77917fe21a311b4c

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

[+]
Settings: add key to USB Storage Unmount option

If we want to be able to highlight this preference and we need a key to do so.

Change-Id: I8c78f8cf8e75bbc071438ef4f733f3ac49e27791
Signed-off-by: Roman Birg <roman@cyngn.com>

[+]
Settings: Fix alignment of print settings icon

In case the print header row was not used for an account row before,
the print icon appeared shifted to the left.

Change-Id: Ieeafca0c16083f4a45b57a1015bb412da26bb0e9

[+]
Settings: HighTouchSensitivity support

Change-Id: I3e4cd681d0e9b93eff9a65b69c0f38efe3b5a18b

[+]
Settings: Improve touch sensivity string

Change-Id: I47cfb414af91657ed158b4010ffa0bbf21c0e8e9

[+]
Display: Default SRE to off

Facemelt mode is catching people by surprise and being interpreted
as "messed up colors". Default it to off so people can at least see
it kick in as a reaction to enablement

Change-Id: I5816e528363f508fc360c321c702a59f0bb79846

[+]
Automatic translation import

Change-Id: Ie92d2963e2fca27455c2c9608d366a082aaaf8ac