Commit Graph

15697 Commits

Author SHA1 Message Date
Fabrice Di Meglio
f8310c1850 Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev 2014-09-11 00:23:32 +00:00
Fabrice Di Meglio
2a8f7cb736 Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
- close the stream properly in all cases

Change-Id: I3a593be534ea444a2e2659458918cce221891456
2014-09-10 17:20:17 -07:00
PauloftheWest
b2197d90a8 Added bluetooth_device_settings_header to fix build breakage.
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
2014-09-10 16:22:15 -07:00
PauloftheWest
52e1946554 am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
  Made Bluetooth device dialog fully scrollable.
2014-09-10 22:20:37 +00:00
Jim Miller
ca03758ed6 Merge "Keep unlock attempt count after configuration change" into lmp-dev 2014-09-10 22:18:23 +00:00
PauloftheWest
1675c786bf Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev 2014-09-10 22:11:56 +00:00
John Spurlock
315e0a4a9e am 31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '31915522b764a097c5d660cb933d4acb5eb0fcb4':
  Settings: Remove fixed dropdown width from "From" pref.
2014-09-10 22:06:09 +00:00
John Spurlock
31915522b7 Settings: Remove fixed dropdown width from "From" pref.
Bug:17457729
Change-Id: I99d294f43211765e410af53e87bb96b06715c0e3
2014-09-10 17:49:28 -04:00
PauloftheWest
4708092e4f am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '8b7d27cb78b09d9b2b2f4185308a042f471276ef':
  Updated Bluetooth keyboard icon to teal.
2014-09-10 21:43:11 +00:00
PauloftheWest
8b7d27cb78 Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev 2014-09-10 21:35:15 +00:00
PauloftheWest
26747b9da0 Made Bluetooth device dialog fully scrollable.
+ Also updated padding around Available Devices.
+ Also updated opacity on Bluetooth's "your device is visible" message.

Bug: 17398966
Change-Id: Id9631334ee0f3a01e40b00470d6debf6a31abe47
2014-09-10 14:33:52 -07:00
PauloftheWest
85daf61bda Updated Bluetooth keyboard icon to teal.
Bug: 17140804
Change-Id: I59a4c0ff81b723ff4676b607e3da6cdc5c73625e
2014-09-10 14:24:11 -07:00
Carlos Valdivia
37b58a420f SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends.  This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.

Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit f5d3e74ecc)
2014-09-10 21:13:10 +00:00
Jorim Jaggi
0cb467afe1 Keep unlock attempt count after configuration change
Bug: 17416448
Change-Id: I79839a5e8020b184dd8928b47fc018d5209988ed
2014-09-10 14:12:41 -07:00
Jason Monk
c80014fbbb am 062f736c: Adding zen mode condition dialog
* commit '062f736c8bfda9ac6ac7476ad51e52ca077f1505':
  Adding zen mode condition dialog
2014-09-10 20:43:01 +00:00
Jason Monk
062f736c8b Adding zen mode condition dialog
So that when you turn on priority or none in settings, you can
select the end condition.

Depends on framework changes: I9300af4f8b6d80042452b75db3418b20c5c5cc81

Bug: 15454830
Change-Id: I7856beabdd54de2ef10fa5c3d38bf27f36014693
2014-09-10 20:32:39 +00:00
Fabrice Di Meglio
743400b466 am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '877fb7fb425ed63f01a941718cea5fc263e74731':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
2014-09-10 20:19:55 +00:00
Fabrice Di Meglio
877fb7fb42 Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 2014-09-10 20:14:15 +00:00
Fabrice Di Meglio
ade5761557 Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
- add missing string

Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
2014-09-10 13:12:25 -07:00
Dan Sandler
3d4b542d75 Show a better list of apps.
By using the new LauncherApps service we can make sure to
use the same filter that launchers do. (For example, many apps
don't set CATEGORY_DEFAULT on their front door activity.)

Bug: 17423134
Change-Id: I9538f306c9e2a8607b0c25b1a9a6ac3a7879a2c8
2014-09-10 18:10:12 +00:00
John Spurlock
417b826176 am 1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '1e7dbd455eade6e6d8f1abd7969dd096972ed84f':
  Settings: Use the same day sequence for downtime.
2014-09-10 17:06:33 +00:00
John Spurlock
0ed4f5b7b1 am cddb2954: Settings: Make downtime days scrollable.
* commit 'cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
  Settings: Make downtime days scrollable.
2014-09-10 17:06:32 +00:00
John Spurlock
1e7dbd455e Settings: Use the same day sequence for downtime.
Make the starting day (Monday) the same between
the selection dialog and the summary text.

Bug:17390052

Change-Id: I4f884cb5e02c1cc2642ab05915cd94c655b9f362
2014-09-10 11:57:46 -04:00
John Spurlock
cddb29544a Settings: Make downtime days scrollable.
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
2014-09-10 10:04:44 -04:00
Zoltan Szatmary-Ban
860e1e1f44 Fixing Trusted Credentials Settings crash
List adapter's getCount method did not check for the case of uninitialised
data. This CL fixes that.

Bug:17437943
Change-Id: I72d7f2c92aa380b1aaafe0658bd920017ff23906
2014-09-10 12:22:36 +01:00
Matthew Xie
a5d4c1b2be am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '72e5583d2a9af10f2750e9abd23c3d5400e3c789':
  Do not remove bonded devices from cached device list upon a device scan
2014-09-10 00:56:06 +00:00
Matthew Xie
72e5583d2a Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev 2014-09-10 00:48:41 +00:00
Carlos Valdivia
cece1cb208 am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit 'af85b740461b69d9b52d6d19a81d06f3a15b6507':
  SECURITY: Prevent preference intents from exploiting settings.
2014-09-10 00:24:44 +00:00
Carlos Valdivia
af85b74046 Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 2014-09-10 00:16:16 +00:00
Elliott Hughes
6312a72136 am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit 'a6e57b88ffa2af3014a3f689e3d08c7b77c9a64d':
  Always use the LocalePicker's preferred locale names.
2014-09-10 00:15:29 +00:00
Jorim Jaggi
723abba6c5 am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit 'b2bea36bb51af63a5e65cedbf49c3ccdd5a7507c':
  Fix layout issues with landscape pattern/password layouts
2014-09-10 00:15:00 +00:00
Matthew Xie
b17031bed0 Do not remove bonded devices from cached device list upon a device scan
Bug: 17405122

Change-Id: I3f5cc6ddc8f85d3b6223f9ff60e1d5eeb76c530a
2014-09-09 15:12:43 -07:00
Elliott Hughes
a6e57b88ff Merge "Always use the LocalePicker's preferred locale names." into lmp-dev 2014-09-09 21:49:39 +00:00
Elliott Hughes
81395c8f3d Always use the LocalePicker's preferred locale names.
Without this change we have the odd situation where LocalePicker goes out of
its way to avoid saying certain things but then -- as long as there's more than
one locale for a given language -- Settings would happily report the name we'd
been avoiding. (Either because it's too specific or because it's too sensitive.)

Also remove the unused bit-rotted duplicate of the blacklist; even if we needed
to access that list directly, we should use LocalePicker's copy.

Bug: 17150708
Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
2014-09-09 14:33:11 -07:00
Jorim Jaggi
b2bea36bb5 Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev 2014-09-09 21:18:39 +00:00
Jorim Jaggi
8de05c57b5 Fix layout issues with landscape pattern/password layouts
Bug: 17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
2014-09-09 23:11:58 +02:00
PauloftheWest
56b3f338e7 am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '654517a510dd4f655a468ad0083d04929338a7df':
  Fixed a Null Pointer Error in Bluetooth Settings.
2014-09-09 20:52:13 +00:00
PauloftheWest
654517a510 Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev 2014-09-09 20:45:59 +00:00
Amith Yamasani
b89313812d am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '6707999600129286ad362bfc2974e321ff06ec90':
  Handle disallowed NFC beam restriction
2014-09-09 20:38:36 +00:00
Adam Lesinski
98739309e1 am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '3649045d109090f8e5951414179fa87dd68ed519':
  Make UsageAccess WarningDialog actually instatiatable.
2014-09-09 20:38:35 +00:00
Amith Yamasani
6707999600 Merge "Handle disallowed NFC beam restriction" into lmp-dev 2014-09-09 20:30:36 +00:00
Adam Lesinski
3649045d10 Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 2014-09-09 20:30:11 +00:00
Amith Yamasani
25a1e95ed6 Handle disallowed NFC beam restriction
Don't enable the beam setting and toggle if it is disallowed for
the current user.

Bug: 17387303
Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
2014-09-09 12:07:11 -07:00
PauloftheWest
4cf6dcf6af am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '29a9c6844b04415505a9a3e9212f85432492702e':
  Removed connect button from Saved Networks dialog.
2014-09-09 18:53:59 +00:00
Adam Lesinski
21dfa201f8 Make UsageAccess WarningDialog actually instatiatable.
The DialogFragment used for WarningDialog was not instatiatable
by the fragment manager.

Bug:17435234
Change-Id: I5f65dd1e0ec0b95d048934480bd5fafd8648ab7c
2014-09-09 11:34:55 -07:00
Carlos Valdivia
92f7615502 SECURITY: Prevent preference intents from exploiting settings.
Settings has super powers because it shares the system uid. We prevent
those powers from being exploited by malicious authenticators by
checking the intents those authenticators provide.

We will only launch intents that resolve to Activities that are exported=true
or owned by the same UID as the authenticator.

Bug: 14408627
Change-Id: Ia179df8561d29745767dac0f3c97eb0f68083f59
2014-09-09 11:17:19 -07:00
PauloftheWest
29a9c6844b Merge "Removed connect button from Saved Networks dialog." into lmp-dev 2014-09-09 18:00:49 +00:00
PauloftheWest
c009b8a496 Fixed a Null Pointer Error in Bluetooth Settings.
+ The root of the problem is that the callback for a device change may be
set before the fragment has a layout.  Then if a change does come in,
getView() would return null.  This fix delays registering the callback
until appropiate.

Bug: 17404518
Change-Id: Ibd0e90f82593d45729f427bcc2e40fe9195eb42a
2014-09-09 10:12:00 -07:00
Zoltan Szatmary-Ban
dbcfc1b736 am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '574db4269528c7277f6e14a44156909fdb063190':
  Update Trusted Credentials screen in settings
2014-09-09 11:12:27 +00:00
Zoltan Szatmary-Ban
574db42695 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-09-09 11:05:54 +00:00