Commit Graph

16135 Commits

Author SHA1 Message Date
Fabrice Di Meglio
6e0e1483a0 am f8310c18: 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
* commit 'f8310c18508275b1125e7677579fd610cecf29c6':
  Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-11 00:34:23 +00:00
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
c0a2603e5a am 3c46239f: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '3c46239f1bce75ab2a4fafd134b730580db22214':
  Added bluetooth_device_settings_header to fix build breakage.
2014-09-10 23:42:58 +00:00
PauloftheWest
3c46239f1b am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit 'b2197d90a8f173ef6ca3071aa434cc7283f85a42':
  Added bluetooth_device_settings_header to fix build breakage.
2014-09-10 23:33:20 +00:00
PauloftheWest
b2197d90a8 Added bluetooth_device_settings_header to fix build breakage.
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
2014-09-10 16:22:15 -07:00
Jim Miller
447264d572 am 807c02ed: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '807c02edc8eb02327c73b78ab1b2b3a593cedca2':
  Keep unlock attempt count after configuration change
2014-09-10 22:38:53 +00:00
Jim Miller
807c02edc8 am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit 'ca03758ed6399d73c841bec8685ea1f19bf38fea':
  Keep unlock attempt count after configuration change
2014-09-10 22:28:48 +00:00
PauloftheWest
4f006d9dd1 am e9cb4bf2: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit 'e9cb4bf280a5f211029f4e5c1b9bacd031bfdf92':
  Made Bluetooth device dialog fully scrollable.
2014-09-10 22:24:49 +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
e9cb4bf280 am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
  Made Bluetooth device dialog fully scrollable.
2014-09-10 22:17:25 +00:00
John Spurlock
a3eee6fb2d am 4fba99a9: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '4fba99a95f94af2d8c152256bbe7a42b00ec2941':
  Settings: Remove fixed dropdown width from "From" pref.
2014-09-10 22:17:13 +00:00
PauloftheWest
1675c786bf Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev 2014-09-10 22:11:56 +00:00
John Spurlock
4fba99a95f 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:16 +00:00
PauloftheWest
94f927b6d5 am 4e5e8a92: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '4e5e8a92007dded8c2ac87d61724ed2c62a14d9e':
  Updated Bluetooth keyboard icon to teal.
2014-09-10 21:54:53 +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
4e5e8a9200 am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '8b7d27cb78b09d9b2b2f4185308a042f471276ef':
  Updated Bluetooth keyboard icon to teal.
2014-09-10 21:44:16 +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
a9681ddb17 am 540743d4: am 062f736c: Adding zen mode condition dialog
* commit '540743d486ee58e908fa0264b3e15c2e1cc4c46d':
  Adding zen mode condition dialog
2014-09-10 20:53:20 +00:00
Jason Monk
540743d486 am 062f736c: Adding zen mode condition dialog
* commit '062f736c8bfda9ac6ac7476ad51e52ca077f1505':
  Adding zen mode condition dialog
2014-09-10 20:42:47 +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
e384b2534b am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '263233b2c3aad1723254cafe694d63596b26b8ca':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
2014-09-10 20:32:02 +00:00
Fabrice Di Meglio
263233b2c3 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:22:56 +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
2c19551efb am a2f9e2a2: am 1e7dbd45: Settings: Use the same day sequence for downtime.
* commit 'a2f9e2a2ad2edd15ea9c89ec92b4b3dc0d8bcf19':
  Settings: Use the same day sequence for downtime.
2014-09-10 17:14:21 +00:00
John Spurlock
77056e3f04 am 740eeb97: am cddb2954: Settings: Make downtime days scrollable.
* commit '740eeb97d73a0aa74d96da0a3309462b08da8e09':
  Settings: Make downtime days scrollable.
2014-09-10 17:14:18 +00:00
John Spurlock
a2f9e2a2ad 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:05 +00:00
John Spurlock
740eeb97d7 am cddb2954: Settings: Make downtime days scrollable.
* commit 'cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
  Settings: Make downtime days scrollable.
2014-09-10 17:06:05 +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
cc95d3f7e1 am 5cb10679: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '5cb10679f9c1133d46d38a6137297af909ecb9ad':
  Do not remove bonded devices from cached device list upon a device scan
2014-09-10 01:12:02 +00:00
Matthew Xie
5cb10679f9 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:07 +00:00
Carlos Valdivia
80326775df am 5db29283: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '5db2928351f3bc37a7a31537f480753456ed3b68':
  SECURITY: Prevent preference intents from exploiting settings.
2014-09-10 00:52:02 +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
5db2928351 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:22:36 +00:00
Carlos Valdivia
af85b74046 Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev 2014-09-10 00:16:16 +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
ebd410e529 am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '38a8fa2e48b79c881f876af8640608cfdc648363':
  Always use the LocalePicker's preferred locale names.
2014-09-09 22:09:19 +00:00
Jorim Jaggi
b0ee68d5da am 5c202a51: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '5c202a51b9598a7a1bd302a5b2d04dd751a72b3c':
  Fix layout issues with landscape pattern/password layouts
2014-09-09 21:57:01 +00:00
PauloftheWest
a6b9eaafbb am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit 'a547bb9940e38c6dd60eb998f17a17c26e350bbf':
  Fixed a Null Pointer Error in Bluetooth Settings.
2014-09-09 21:56:23 +00:00
Elliott Hughes
38a8fa2e48 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-09 21:56:01 +00:00
Amith Yamasani
942102efd3 am e7f89b6b: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit 'e7f89b6bfc5d3aeaa6ce1d330e5d7872ed87168d':
  Handle disallowed NFC beam restriction
2014-09-09 21:55:55 +00:00
Adam Lesinski
2554ccc9e2 am caf1be66: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit 'caf1be66d1676df9796274f8eaed4c334774f15e':
  Make UsageAccess WarningDialog actually instatiatable.
2014-09-09 21:55:54 +00:00