Add Temasek version info
One does not simply become a Developer

Also contains:
From 2622e3cddd08448666fcfd584a8794727e1b2979 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Wed, 2 Jul 2014 16:32:03 +0300
Subject: [PATCH] Fix translatability of modified dev countdown strings

Change-Id: I3bc1749e27068a63144fd4f3b059396344e7858d

Change-Id: I64ab4d7ab9d8334275d2e4d493b716a8fc73ab4e
Add preference for enabling root access (3/3)

 * Root over ADB is now disabled by default on non-eng builds
 * Requires support in su binary and adbd
 * Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/DevelopmentSettings.java

Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.

Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff

DevSettings: Fix the root-access toggle in eng builds

It was being unconditionally removed, put it back

Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47
Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-12.0
Settings :Add lockscreen icon.

Change-Id: I95500f427066f9d9683bdcf5478f6f86aebb762c
Profiles : Settings

Change-Id: I072758a1c5ec04ef34077551220b6611068fe71d
Settings : Hardware key rebinding (2/2)

Change-Id: I1a0546f358e787a9c6ab12024e34255475259424
Add back blacklist settings.

Change-Id: Iae35717acfa9af4da75c07d24352acf981d19fc7
Improve translatability of summaries.

Change-Id: I362b335cbe219d6e371a458c9d50fcd66bdf19fe
Settings: Alert user when they attempt to add an invalid number to BL.

  - BlacklistProvider will reject numbers that aren't valid, silently. So instead of
  resuming to a blank screen, we should alert the user that the number they attempted to
  add is invalid by utilizing BlacklistUtils#addOrUpdate method.

Change-Id: I1ca32427baad41c1c9379e18046e6ca7937b6d32
Add missing blacklist xxhdpi drawables.

Change-Id: I327f408ff344e9358c479cf5fe9dc341918511b2
Introduce SystemSettingsCheckBoxPreference

  -Originally part of a3342e2 (Add back notification
   light settings.)

Change-Id: I474a14a1b395407f5ca273a5d6a3a7f03f7e4698
Protected App [2/3] Protected Apps Settings -> Apps: - Added Receiver which can send in a call to PackageManager to toggle a components protected status. - Add Protected Apps activity (available from Apps fragment) - Reads from ApplicationInfo state - Requires Pattern Lock to view/modify protected apps - Updates Settings Secure DB with protected components - Support resetting protected apps pattern lock

Change-Id: If07a7b69ac963ffae855621881e1944fc8754782
Protected Apps:

 - App Info for protected Apps doesn't allow Uninstall or Clear data
 - App Info menu item for launching into Protected Apps when looking at protected components
 - Prevent process dialog from getting dismissed on touch or back key (can cause odd behavior if cancelled mid-protect)

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java

Change-Id: I64104d7ff3fbf9d8c393ebf262d4de0b28abbc5c
Reset Pattern: - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Clean up protected apps code (1/2)

- Work with actual ComponentNames instead of converting them between
  String and ComponentName all the time
- Name protection state parameter in methods 'state' instead of
  'protect', as a value of true actually means it's not protected. Also
  consistently use the respective constants for its values.
- Some misc. cleanup

Change-Id: I2855978c8aef3cfa14249e3398039c7cdd145ede
Settings: Create a security fallback on protected apps.

  -- Allow a user to bypass pattern lock on protected apps
  by inputting their primary account information for the
  device.

Conflicts:
	res/values/cm_dimens.xml
	res/values/cm_strings.xml

Change-Id: I39e5a89a8699cfd2ffaba8aea2daa4f477f2cc9b
settings: reset protected apps view instead of finish the activity

Finish the app after resettings the account, will lead to the protected app selection without a
valid pattern. Instead this should reset the pattern view to create a new pattern prior to go to
protected apps.

Change-Id: Ida41a29f4f8787940f803a23014a68a2f8beb969
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Settings: Don't show protected apps options in restricted profiles.

Change-Id: I38c2e8fd3508d360f0e23703ce6c939f02f3714e
JIRA: 4668
Issue: https://jira.cyanogenmod.org/browse/CYAN-4668
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1