OSDN Git Service
Udam Saini [Wed, 10 Feb 2016 18:06:47 +0000 (18:06 +0000)]
Merge "Reworks lock screen flows." into nyc-dev
am:
779fdcca29
* commit '
779fdcca29d1c87fd5dba7fd7198db182c39620c':
Reworks lock screen flows.
Udam Saini [Wed, 10 Feb 2016 17:54:58 +0000 (17:54 +0000)]
Merge "Reworks lock screen flows." into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 16:46:05 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
51d56dc14e -s ours
* commit '
51d56dc14ea77334c4897f884151fac83cdcb632':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 16:43:32 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:48:36 +0000 (07:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Feb 2016 15:47:06 +0000 (15:47 +0000)]
Import translations. DO NOT MERGE am:
a27cd9d033 -s ours
am:
029c196bf6 -s ours
* commit '
029c196bf6f60c5d6631119691e6b41d357fde6f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:43:33 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE
am:
a27cd9d033 -s ours
* commit '
a27cd9d033b557d3ff791260eb51f090d8370218':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:23:28 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
Jeremy Klein [Wed, 10 Feb 2016 02:41:12 +0000 (02:41 +0000)]
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
am:
d119f50314
* commit '
d119f50314c4923529a11dade3248005c26b4cfd':
Remove PM query for silent provisioning BroadcastReceiver.
Jeremy Klein [Wed, 10 Feb 2016 02:40:04 +0000 (02:40 +0000)]
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
Andre Eisenbach [Wed, 10 Feb 2016 02:13:20 +0000 (02:13 +0000)]
Add Developer menu entry to disable Bluetooth absolute volume
am:
591c6c4f5a
* commit '
591c6c4f5ac73387dc83e119627344a78fd615c6':
Add Developer menu entry to disable Bluetooth absolute volume
Andre Eisenbach [Mon, 8 Feb 2016 23:40:23 +0000 (15:40 -0800)]
Add Developer menu entry to disable Bluetooth absolute volume
NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .
Bug:
27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
Andre Eisenbach [Tue, 9 Feb 2016 23:55:04 +0000 (23:55 +0000)]
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
am:
6979c8bbe3 -s ours
* commit '
6979c8bbe3eeea1e225049a0658a98b85836c076':
Add Developer menu entry to disable Bluetooth absolute volume
Jim Miller [Tue, 9 Feb 2016 23:39:55 +0000 (23:39 +0000)]
Fix crash in Settings on devices without fingerprint.
am:
017bdceeb4
* commit '
017bdceeb44aa55ec08033d004bba4f071844dc4':
Fix crash in Settings on devices without fingerprint.
Jeremy Klein [Tue, 9 Feb 2016 21:11:25 +0000 (13:11 -0800)]
Remove PM query for silent provisioning BroadcastReceiver.
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit
f19aa5574b3ee89e9e7c38c6a2d8a625e3c7811e)
Jim Miller [Tue, 9 Feb 2016 23:15:32 +0000 (15:15 -0800)]
Fix crash in Settings on devices without fingerprint.
Fixes bug
27060816
Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd
Andre Eisenbach [Tue, 9 Feb 2016 21:20:03 +0000 (21:20 +0000)]
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
Udam Saini [Thu, 4 Feb 2016 01:31:11 +0000 (17:31 -0800)]
Reworks lock screen flows.
This also adds frp warning dialogs in case the user skips lock
screen setup initially.
bug:
26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
Udam Saini [Tue, 9 Feb 2016 18:50:39 +0000 (18:50 +0000)]
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
am:
40f4bf2a1f
* commit '
40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3':
Adds the headers for choose lock generic inside onCreate
Udam Saini [Tue, 9 Feb 2016 18:47:13 +0000 (18:47 +0000)]
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
Udam Saini [Tue, 9 Feb 2016 18:32:56 +0000 (10:32 -0800)]
Adds the headers for choose lock generic inside onCreate
This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.
bug:
26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c
Samuel Tan [Tue, 9 Feb 2016 18:29:47 +0000 (18:29 +0000)]
Allow trusted system certificates to be used in EAP network configs am:
2b16cd3920
am:
aedb058e1b
* commit '
aedb058e1b46ce559fc6a282820a89dcbc9c15d1':
Allow trusted system certificates to be used in EAP network configs
Samuel Tan [Tue, 9 Feb 2016 18:24:20 +0000 (18:24 +0000)]
Allow trusted system certificates to be used in EAP network configs
am:
2b16cd3920
* commit '
2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
Allow trusted system certificates to be used in EAP network configs
Andre Eisenbach [Mon, 8 Feb 2016 23:40:23 +0000 (15:40 -0800)]
Add Developer menu entry to disable Bluetooth absolute volume
Bug:
27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
Tony Mantler [Mon, 8 Feb 2016 22:34:50 +0000 (22:34 +0000)]
Merge "Fix security level display" into nyc-dev
am:
b42b9045e2
* commit '
b42b9045e25d24676ef9c3e0cb3b36f2c98d9a10':
Fix security level display
Anna Galusza [Mon, 8 Feb 2016 22:34:24 +0000 (22:34 +0000)]
Update strings for A11y SUW.
am:
0239f95538
* commit '
0239f95538b572c7951cac65707d906ef051bbf3':
Update strings for A11y SUW.
Tony Mantler [Mon, 8 Feb 2016 22:05:07 +0000 (22:05 +0000)]
Merge "Fix security level display" into nyc-dev
Tony Mantler [Mon, 8 Feb 2016 22:02:05 +0000 (14:02 -0800)]
Fix security level display
b/
26979319
Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d
Anna Galusza [Mon, 8 Feb 2016 17:57:24 +0000 (09:57 -0800)]
Update strings for A11y SUW.
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
Jim Miller [Mon, 8 Feb 2016 20:40:40 +0000 (20:40 +0000)]
Fix crash in ConfirmCredentials due to missing fp service.
am:
5947d3517d
* commit '
5947d3517d1cd841ddeb6f756e1953fc8679c9cc':
Fix crash in ConfirmCredentials due to missing fp service.
Jim Miller [Mon, 8 Feb 2016 20:29:25 +0000 (12:29 -0800)]
Fix crash in ConfirmCredentials due to missing fp service.
Fixes bug
27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit
0918e5d650119aed5221b8ed3ac378f273216b45)
Geoff Mendal [Mon, 8 Feb 2016 19:02:24 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
0f6b093db7 -s ours
* commit '
0f6b093db74fc4b1b914b1d7b301f9e841184ffe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 16:55:50 +0000 (17:55 +0100)]
Import translations. DO NOT MERGE
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
Samuel Tan [Tue, 2 Feb 2016 23:54:37 +0000 (15:54 -0800)]
Allow trusted system certificates to be used in EAP network configs
Add an option to the "CA certificate" field of the EAP network
configuration menu, "Use system certificates". Choosing this option
will cause the trusted, pre-installed, system CA certificates
to be used to validate EAP servers during the authentication process.
This only applies to EAP-TLS, EAP-TTLS, and EAP-PEAP network
configurations, where the CA certificate option is available.
If the user selects "Use system certificates" and leaves the
"Domain" field empty, display a warning and prevent the
EAP network configuration from being saved. Such a configuration
would be insecure--the user should constrain the domain that
the system certificates can be used to validate.
BUG:
26879191
TEST: 1) Set up AP connected to test RADIUS server.
TEST: 2) Generate a self-signed cert (Cert 1)
TEST: 3) Use Cert 1 to sign another cert (Cert 2) with common name
"sub1.sub2.domain.com"
TEST: 4) Setup RADIUS server, and configure it to present Cert 2 to EAP peer.
TEST: 5) Build angler image with Cert 1 installed in
/system/etc/security/cacerts/
TEST: 6) Set up an AP connected to the RADIUS server to broadcast
a WPA-Enterprise network.
TEST: 7) On Angler, connect to this WPA-Enterprise network with settings:
Network name: (AP SSID)
Security: 802.1x EAP
EAP method: TLS
CA certificate: Use system certificates
Domain: domain.com
User certificate: (test certificate from RADIUS setup)
Identity: (identity used for RADIUS setup)
TEST: 8) Verify that we connect successfully to the AP.
TEST: 9) Verify that connection still succeeds if Domain is set to
"sub2.domain.com" and "sub1.sub2.domain.com".
TEST: 10) Verify that connection fails if Domain is set to
"sub0.sub1.domain.com" and "otherdomain.com".
TEST: 11) Verify that network configuration cannot be saved, and an
warning message "Must specify a domain" is displayed if Domain
is left blank in the configuration in step 7
TEST: 12) Verify that the "Do not validate" option still appears in the
CA certificate dropdown menu.
Change-Id: I346d4d301305719033b84ec4599bf3d57d9d4ee5
Julia Reynolds [Fri, 5 Feb 2016 20:26:24 +0000 (15:26 -0500)]
Update DND visual interruption choices.
Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c
Clara Bayarri [Fri, 5 Feb 2016 17:37:02 +0000 (17:37 +0000)]
Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments
Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.
Bug:
26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419
Clara Bayarri [Fri, 5 Feb 2016 17:17:19 +0000 (17:17 +0000)]
Do not unify locks when Work lock is set to None
Bug:
26845805,
26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
Adam Lesinski [Sat, 6 Feb 2016 00:52:39 +0000 (00:52 +0000)]
Merge "Update FakeUid interface to match BatteryStats.Uid"
Alan Viverette [Fri, 5 Feb 2016 21:28:58 +0000 (21:28 +0000)]
Merge "Reject all touch events in TouchBlockingFrameLayout"
Alan Viverette [Fri, 5 Feb 2016 21:13:27 +0000 (16:13 -0500)]
Reject all touch events in TouchBlockingFrameLayout
Bug:
27042494
Change-Id: Ie1400f4c47d812b1f664abc955ee3dfdd03fa4a5
Samuel Tan [Fri, 5 Feb 2016 20:58:15 +0000 (20:58 +0000)]
Correctly load saved EAP CA cert and user cert options
am:
3d8cdb10f6
* commit '
3d8cdb10f6103a794e4cb68adb5de03a325d1c8f':
Correctly load saved EAP CA cert and user cert options
Jeremy Klein [Fri, 5 Feb 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Remove TetherUtil functions which are no longer needed."
Jeremy Klein [Fri, 5 Feb 2016 18:14:50 +0000 (18:14 +0000)]
Merge "Make TetherSettings use the new tether api."
Julia Reynolds [Fri, 5 Feb 2016 16:11:56 +0000 (16:11 +0000)]
Merge "Remove bad activity filter."
Andrei Stingaceanu [Mon, 1 Feb 2016 15:40:53 +0000 (15:40 +0000)]
Restrict notification preferences for suspended apps
Bug:
26856390
Bug:
22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c
Julia Reynolds [Fri, 5 Feb 2016 14:37:52 +0000 (09:37 -0500)]
Remove bad activity filter.
Bug:
26982026
Change-Id: I662af8db38f4ac624ba4bd1128e7b3a1123d9f8b
Jeremy Klein [Fri, 29 Jan 2016 20:46:42 +0000 (12:46 -0800)]
Remove TetherUtil functions which are no longer needed.
Change-Id: I8559a2aaffa44e165d4e5e9070a85f23ed02b58b
Jeremy Klein [Mon, 25 Jan 2016 22:43:49 +0000 (14:43 -0800)]
Make TetherSettings use the new tether api.
The new API handles all the provisioning logic so this area can
get significant code cleanup.
Change-Id: I4bcffb14b3ce26a01d17ec149599d63b0b4392f1
Jim Miller [Fri, 5 Feb 2016 01:41:00 +0000 (01:41 +0000)]
Merge "Fix crash on devices without fingerprint feature."
Roozbeh Pournader [Fri, 5 Feb 2016 01:39:00 +0000 (01:39 +0000)]
Merge "Replace LocaleList#getPrimary() with get(0)"
Jim Miller [Fri, 5 Feb 2016 01:10:44 +0000 (17:10 -0800)]
Fix crash on devices without fingerprint feature.
Fixes bug
26877020
Change-Id: Ibee4d956beb0ce9af35f01857370c1378ef5594a
Roozbeh Pournader [Thu, 4 Feb 2016 23:55:41 +0000 (15:55 -0800)]
Replace LocaleList#getPrimary() with get(0)
getPrimary() is removed from the API due to potential confusion about
what it means.
Bug:
26984092
Change-Id: If218de84251461016f4ac06aa9a1cb8610b90d39
Jason Monk [Thu, 4 Feb 2016 23:00:20 +0000 (23:00 +0000)]
Merge "Move most settings icons to vector"
Jason Monk [Thu, 4 Feb 2016 22:56:26 +0000 (17:56 -0500)]
Move most settings icons to vector
Change-Id: I04f3f0ed75f2a17942e8571393e3cceb0d2bd7ed
Mihai Niță [Thu, 4 Feb 2016 22:20:18 +0000 (22:20 +0000)]
Merge "Locale list: format the numbers using the UI locale"
Mihai Nita [Tue, 2 Feb 2016 16:15:03 +0000 (08:15 -0800)]
Locale list: format the numbers using the UI locale
The digits used for numbering the drag-and-drop locale list should
use a locale-aware formatter.
We will not see decimal or thousand separators, but the visible
difference is in the use of native digits. Example: Arabic.
Change-Id: I3f8cd5a3adea1cb88ae63f09711c728f4588020c
Jason Monk [Thu, 4 Feb 2016 20:54:02 +0000 (20:54 +0000)]
Merge "Add animation for condition card height change."
Jason Monk [Thu, 4 Feb 2016 20:29:59 +0000 (15:29 -0500)]
Add animation for condition card height change.
Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
Jason Monk [Thu, 4 Feb 2016 19:47:43 +0000 (19:47 +0000)]
Merge "Settings Visuals"
Jason Monk [Thu, 4 Feb 2016 19:35:49 +0000 (14:35 -0500)]
Settings Visuals
Update the layouts to be more final, and support tablets better.
Move about to always be last.
Always see everything.
Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
Casey Burkhardt [Thu, 4 Feb 2016 19:35:53 +0000 (19:35 +0000)]
Merge "Remove ActivityManagerNative dependency for adjusting font scale"
Sudheer Shanka [Thu, 4 Feb 2016 19:14:16 +0000 (19:14 +0000)]
Merge "Use the correct userId when checking if disabled by admin."
Alan Viverette [Thu, 4 Feb 2016 16:42:48 +0000 (11:42 -0500)]
Fix build
Change-Id: Ib87ddd906cc833cc442d8bd168388af0c2fbf8d0
Alan Viverette [Thu, 4 Feb 2016 16:07:42 +0000 (16:07 +0000)]
Merge "App grid preview for screen zoom"
Alan Viverette [Thu, 4 Feb 2016 15:12:05 +0000 (10:12 -0500)]
App grid preview for screen zoom
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
Jason Monk [Wed, 3 Feb 2016 22:05:57 +0000 (22:05 +0000)]
Merge "Make cell data usage an array"
Anna Galusza [Wed, 3 Feb 2016 21:40:08 +0000 (21:40 +0000)]
Merge "UI fixes (back arrow, blue switch bar, append whether Talkback is on to summary), Talkback no longer disabled when preference is tapped, fixes SettingsPreferenceFragment to not check parent class to determine whether to show options menu."
Sunny Goyal [Wed, 3 Feb 2016 21:35:20 +0000 (21:35 +0000)]
Merge "Adding fast scroller in app list"
Samuel Tan [Wed, 3 Feb 2016 21:21:57 +0000 (13:21 -0800)]
Correctly load saved EAP CA cert and user cert options
Previously, we did not properly load the "Do not validate"
and "Do not provide" options for the CA certificate and
User certificate EAP network configuration fields respectively
when the user previously selected these options and saved the
configuration.
Fix this by properly checking the saved CA certificate and user
certificate aliases in the saved enterprise config.
BUG:
26686071
Change-Id: If180c611f7210718cfb11c0578545b6f027827b5
TEST: Saved EAP network with the abovementioned options.
TEST: Long-pressed saved network on Wifi menu and selected "Modify Network"
TEST: "Do not validate" and "Do not provide" options are re-loaded.
Jason Monk [Wed, 3 Feb 2016 19:11:52 +0000 (19:11 +0000)]
Merge "String refinements touch -> tap"
Jason Monk [Wed, 3 Feb 2016 18:55:48 +0000 (18:55 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am:
8cb4301b59
am:
bf942b7e11
* commit '
bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:53:44 +0000 (18:53 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
am:
8cb4301b59
* commit '
8cb4301b59f95bff09526c32b30ecde396e164f7':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:48:27 +0000 (18:48 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
Jason Monk [Wed, 3 Feb 2016 18:31:38 +0000 (13:31 -0500)]
String refinements touch -> tap
Bug:
26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
Jason Monk [Wed, 3 Feb 2016 18:13:15 +0000 (13:13 -0500)]
Make cell data usage an array
Change-Id: I39ad23882ec30c733281f87ce3c8056bc8ef4bde
Jason Monk [Wed, 3 Feb 2016 18:09:41 +0000 (18:09 +0000)]
Merge "Broadscale logging for Settings"
Udam Saini [Wed, 3 Feb 2016 17:54:16 +0000 (17:54 +0000)]
Merge "Start redaction activity after we finish current activity."
Geoff Mendal [Wed, 3 Feb 2016 17:19:25 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours am:
3abb7c0351 -s ours
am:
4de59d3cdf -s ours
* commit '
4de59d3cdfe375dc3f84a9e83e2130b494682031':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 17:19:05 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
dd33e41c5a -s ours
am:
2e3f763b9c -s ours
* commit '
2e3f763b9c715baa0610c8d5d52d1cfa4f72fb2c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours
am:
3abb7c0351 -s ours
* commit '
3abb7c035126e7150d90c45c18c155547b3e2a66':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:45:28 +0000 (16:45 +0000)]
Import translations. DO NOT MERGE
am:
dd33e41c5a -s ours
* commit '
dd33e41c5a722548027919efdb70b282505e328a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:36:53 +0000 (16:36 +0000)]
Import translations. DO NOT MERGE
am:
10a758b8b7 -s ours
* commit '
10a758b8b7869726a70b2d8fa01221ade1e48181':
Import translations. DO NOT MERGE
Oleksandr Peletskyi [Wed, 3 Feb 2016 15:45:09 +0000 (15:45 +0000)]
Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG:
24890474"
Geoff Mendal [Wed, 3 Feb 2016 15:43:34 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic601f7d4be7b8329b5092836469cfaf352d3ac45
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 15:34:47 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3d3c5d3b41843dab533b33325e67de3de8a88440
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 3 Feb 2016 15:31:57 +0000 (15:31 +0000)]
Merge "Add padlocks to more preferences that can be disabled by admin."
Geoff Mendal [Wed, 3 Feb 2016 14:44:39 +0000 (06:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8f300745f44ddf8d429aa27beba2fc34bf8c9d49
Auto-generated-cl: translation import
Robin Lee [Wed, 3 Feb 2016 13:02:05 +0000 (13:02 +0000)]
Merge "Use MetricsEvent.USER_CREDENTIALS"
Udam Saini [Wed, 3 Feb 2016 01:02:29 +0000 (17:02 -0800)]
Start redaction activity after we finish current activity.
This is needed so that activity manager won't start a new task stack.
During setup, we want everything on the same task stack to allow
task locking.
Change-Id: Iaa1e13da8251ad37362ea41b374300268b6e9875
Udam Saini [Wed, 3 Feb 2016 01:02:08 +0000 (01:02 +0000)]
Merge "Allows user to skip fingerprint during setup"
Sudheer Shanka [Wed, 3 Feb 2016 00:24:52 +0000 (00:24 +0000)]
Add padlocks to more preferences that can be disabled by admin.
Bug:
26899715
Bug:
26767574
Bug:
26768057
Change-Id: I2dc590833cbee1e35047002ef554432f10ddc654
Anna Galusza [Sat, 30 Jan 2016 01:32:19 +0000 (17:32 -0800)]
UI fixes (back arrow, blue switch bar, append whether Talkback is on to
summary), Talkback no longer disabled when preference is tapped, fixes
SettingsPreferenceFragment to not check parent class to determine whether to
show options menu.
Change-Id: I3345e1a878f51b4387ca1bfe89855339617a94d6
Paul Lawrence [Tue, 2 Feb 2016 21:54:06 +0000 (21:54 +0000)]
Merge "Don't show 'unlock at boot' for file encryption"
Noah Wang [Tue, 2 Feb 2016 20:36:47 +0000 (20:36 +0000)]
Merge "Replace SeekBar with LabeledSeekBar for Accessibility-related settings in order to adjust the nonsense read-out by talkback."
Sudheer Shanka [Fri, 29 Jan 2016 22:12:30 +0000 (22:12 +0000)]
Use the correct userId when checking if disabled by admin.
And when adding accounts if only one account type is possible and
it is disabled by admin, show the admin support dialog.
Bug:
26897250
Bug:
26767564
Change-Id: I5cca64491a100efc34307c45aa35c14412f043cd
Noah Wang [Tue, 26 Jan 2016 04:14:42 +0000 (20:14 -0800)]
Replace SeekBar with LabeledSeekBar for Accessibility-related settings
in order to adjust the nonsense read-out by talkback.
Change-Id: I5d2d333c045c3753784b01f731e68918d1175241
Ritesh Reddy [Tue, 2 Feb 2016 20:14:34 +0000 (20:14 +0000)]
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
am:
d2846524a0
* commit '
d2846524a0aadd8c575f34a80c99823765a7342d':
Calling dataChanged() for Net Policy Restrictions
Ritesh Reddy [Tue, 2 Feb 2016 20:11:46 +0000 (20:11 +0000)]
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
Julia Reynolds [Tue, 2 Feb 2016 19:46:35 +0000 (19:46 +0000)]
Merge "Clarify notification blocking in notification app list."