Commit Graph

25236 Commits

Author SHA1 Message Date
Julia Reynolds
9bfad94ea3 Update DND visual interruption choices.
Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c
2016-02-08 15:19:45 +00:00
Clara Bayarri
7f2a013619 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
2016-02-08 14:16:24 +00:00
Clara Bayarri
719668508a Do not unify locks when Work lock is set to None
Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
2016-02-08 13:49:45 +00:00
Adam Lesinski
fdb17a7ba2 Merge "Update FakeUid interface to match BatteryStats.Uid" 2016-02-06 00:52:39 +00:00
Alan Viverette
145b2faf58 Merge "Reject all touch events in TouchBlockingFrameLayout" 2016-02-05 21:28:58 +00:00
Alan Viverette
764dce2ea4 Reject all touch events in TouchBlockingFrameLayout
Bug: 27042494
Change-Id: Ie1400f4c47d812b1f664abc955ee3dfdd03fa4a5
2016-02-05 16:13:27 -05:00
Samuel Tan
5e5038255c Correctly load saved EAP CA cert and user cert options
am: 3d8cdb10f6

* commit '3d8cdb10f6103a794e4cb68adb5de03a325d1c8f':
  Correctly load saved EAP CA cert and user cert options
2016-02-05 20:58:15 +00:00
Jeremy Klein
c69f2be466 Merge "Remove TetherUtil functions which are no longer needed." 2016-02-05 18:15:30 +00:00
Jeremy Klein
6895446453 Merge "Make TetherSettings use the new tether api." 2016-02-05 18:14:50 +00:00
Julia Reynolds
57fae3b3e2 Merge "Remove bad activity filter." 2016-02-05 16:11:56 +00:00
Andrei Stingaceanu
da49313845 Restrict notification preferences for suspended apps
Bug: 26856390
Bug: 22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c
2016-02-05 15:24:03 +00:00
Julia Reynolds
aae6ceac2c Remove bad activity filter.
Bug: 26982026
Change-Id: I662af8db38f4ac624ba4bd1128e7b3a1123d9f8b
2016-02-05 09:37:52 -05:00
Jeremy Klein
3a14416d55 Remove TetherUtil functions which are no longer needed.
Change-Id: I8559a2aaffa44e165d4e5e9070a85f23ed02b58b
2016-02-04 18:58:14 -08:00
Jeremy Klein
e3e7b95312 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
2016-02-04 18:58:14 -08:00
Jim Miller
eb3b52d411 Merge "Fix crash on devices without fingerprint feature." 2016-02-05 01:41:00 +00:00
Roozbeh Pournader
bb300807b8 Merge "Replace LocaleList#getPrimary() with get(0)" 2016-02-05 01:39:00 +00:00
Jim Miller
b528b26ea7 Fix crash on devices without fingerprint feature.
Fixes bug 26877020

Change-Id: Ibee4d956beb0ce9af35f01857370c1378ef5594a
2016-02-05 01:14:51 +00:00
Roozbeh Pournader
2b7d4cd49f 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
2016-02-04 15:55:41 -08:00
Jason Monk
e1943293c3 Merge "Move most settings icons to vector" 2016-02-04 23:00:20 +00:00
Jason Monk
6fc1004401 Move most settings icons to vector
Change-Id: I04f3f0ed75f2a17942e8571393e3cceb0d2bd7ed
2016-02-04 17:57:46 -05:00
Mihai Niță
d7f4d7e177 Merge "Locale list: format the numbers using the UI locale" 2016-02-04 22:20:18 +00:00
Mihai Nita
e7f40be0ef 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
2016-02-04 13:16:05 -08:00
Jason Monk
a1242bcc93 Merge "Add animation for condition card height change." 2016-02-04 20:54:02 +00:00
Jason Monk
6fdf1669e1 Add animation for condition card height change.
Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
2016-02-04 15:44:50 -05:00
Jason Monk
58c6dd6eee Merge "Settings Visuals" 2016-02-04 19:47:43 +00:00
Jason Monk
322cfe8be0 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
2016-02-04 14:37:35 -05:00
Casey Burkhardt
fcb84e6912 Merge "Remove ActivityManagerNative dependency for adjusting font scale" 2016-02-04 19:35:53 +00:00
Sudheer Shanka
91e0ba7d40 Merge "Use the correct userId when checking if disabled by admin." 2016-02-04 19:14:16 +00:00
Alan Viverette
ae733cab7f Fix build
Change-Id: Ib87ddd906cc833cc442d8bd168388af0c2fbf8d0
2016-02-04 11:42:48 -05:00
Alan Viverette
da8c8df1cd Merge "App grid preview for screen zoom" 2016-02-04 16:07:42 +00:00
Alan Viverette
1912725628 App grid preview for screen zoom
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
2016-02-04 10:12:05 -05:00
Jason Monk
0eb0d9bfe3 Merge "Make cell data usage an array" 2016-02-03 22:05:57 +00:00
Anna Galusza
4a05b2906f 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." 2016-02-03 21:40:08 +00:00
Sunny Goyal
3b14483eae Merge "Adding fast scroller in app list" 2016-02-03 21:35:20 +00:00
Samuel Tan
3d8cdb10f6 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.
2016-02-03 13:29:54 -08:00
Jason Monk
0ec94e0064 Merge "String refinements touch -> tap" 2016-02-03 19:11:52 +00:00
Jason Monk
ebfcadc8b8 Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am: 8cb4301b59
am: bf942b7e11

* commit 'bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT
2016-02-03 18:55:48 +00:00
Jason Monk
bf942b7e11 Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
am: 8cb4301b59

* commit '8cb4301b59f95bff09526c32b30ecde396e164f7':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT
2016-02-03 18:53:44 +00:00
Jason Monk
8cb4301b59 Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" 2016-02-03 18:48:27 +00:00
Jason Monk
12fc8f6cff String refinements touch -> tap
Bug: 26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
2016-02-03 13:31:38 -05:00
Jason Monk
f3f6bd47fe Make cell data usage an array
Change-Id: I39ad23882ec30c733281f87ce3c8056bc8ef4bde
2016-02-03 13:13:15 -05:00
Jason Monk
70e1b41f5a Merge "Broadscale logging for Settings" 2016-02-03 18:09:41 +00:00
Udam Saini
662c90aa48 Merge "Start redaction activity after we finish current activity." 2016-02-03 17:54:16 +00:00
Geoff Mendal
aac74a51da Import translations. DO NOT MERGE am: 10a758b8b7 -s ours am: 3abb7c0351 -s ours
am: 4de59d3cdf  -s ours

* commit '4de59d3cdfe375dc3f84a9e83e2130b494682031':
  Import translations. DO NOT MERGE
2016-02-03 17:19:25 +00:00
Geoff Mendal
7d18fc6d2e Import translations. DO NOT MERGE am: dd33e41c5a -s ours
am: 2e3f763b9c  -s ours

* commit '2e3f763b9c715baa0610c8d5d52d1cfa4f72fb2c':
  Import translations. DO NOT MERGE
2016-02-03 17:19:05 +00:00
Geoff Mendal
4de59d3cdf Import translations. DO NOT MERGE am: 10a758b8b7 -s ours
am: 3abb7c0351  -s ours

* commit '3abb7c035126e7150d90c45c18c155547b3e2a66':
  Import translations. DO NOT MERGE
2016-02-03 16:57:07 +00:00
Geoff Mendal
2e3f763b9c Import translations. DO NOT MERGE
am: dd33e41c5a  -s ours

* commit 'dd33e41c5a722548027919efdb70b282505e328a':
  Import translations. DO NOT MERGE
2016-02-03 16:45:28 +00:00
Geoff Mendal
3abb7c0351 Import translations. DO NOT MERGE
am: 10a758b8b7  -s ours

* commit '10a758b8b7869726a70b2d8fa01221ade1e48181':
  Import translations. DO NOT MERGE
2016-02-03 16:36:53 +00:00
Oleksandr Peletskyi
0581f91a75 Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG: 24890474" 2016-02-03 15:45:09 +00:00
Geoff Mendal
dd33e41c5a Import translations. DO NOT MERGE
Change-Id: Ic601f7d4be7b8329b5092836469cfaf352d3ac45
Auto-generated-cl: translation import
2016-02-03 07:43:34 -08:00