packages-apps-Settings

Fork

Add an option to control native bridge

Create an EGL context for DeviceInfoSettings

In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.

Add information about OpenGL driver version

Change-Id: Icf107642b6d84a85c90c7411d6e42e9b6c6ef739
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>

Settings: Add Superuser entry

Squashed commit of the following:

Author: Koushik Dutta <koushd@gmail.com>
Switch to new Superuser
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Author: Danny Baumann <dannybaumann@web.de>
Hide Superuser entry if root access for apps is disabled.
Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e

Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Development: Root for apps is unavailable if the su daemon isn't running

The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.
Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Added Manufacturer to device info

Added an item to display manufacturer in device info page.

For: AIA-438
Change-Id: Iae28759653089cf6fc757c1f76b7ee39638144b0
Signed-off-by: Daniel Leung <daniel.leung@intel.com>

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

DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c

Add translations for Security Patch Level.

Bug: 23946860

Fix sim notifications.

bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242

merge in lmp-mr1-release history after reset to lmp-mr1-dev

merge in lmp-mr1-release history after reset to lmp-mr1-dev

Use TelephonyManager api to get SPN of sim to display in UI.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7

merge in lmp-mr1-release history after reset to lmp-mr1-dev

Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.

Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4

merge in lmp-mr1-release history after reset to lmp-mr1-dev

Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev

Remove SimDialogActivity from recents app list.

Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b

Use getDefaultAdapter instead of getNfcAdapter

getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f

merge in lmp-mr1-release history after reset to lmp-mr1-dev

Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev

Change to fit color name text on color selection spinner in settings.

Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51

Remove sim status and imei for secondary user.

Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8

Change to fit color name text on color selection spinner in settings.

Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51

Repair broken keychain wifi_uid logic

Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.

Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976

Remove sim status and imei for secondary user.

Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8

am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1

* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':

am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1

* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':

am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1

* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':

am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae

* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':

am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
automerge: 3a3ff59

* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started