Commit Graph

16575 Commits

Author SHA1 Message Date
Zoltan Szatmary-Ban
bd6d138fd3 am 212a2dbb: am 12b90be9: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '212a2dbb21a4651bde7da5dc4b26b3cce41e2f77':
  Fixing Trusted Credentials Settings crash
2014-09-11 17:31:33 +00:00
Svetoslav
72cfbcb429 Merge "Fix print icons in settings." into lmp-dev 2014-09-11 17:28:32 +00:00
Fabrice Di Meglio
75027353fd am ab7a2951: am 6e0e1483: 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 'ab7a2951e0f595f7378cf18a7be3ad86371851e4':
  Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-11 17:27:29 +00:00
PauloftheWest
ac0af801ac am c0a2603e: am 3c46239f: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit 'c0a2603e5a86c52dcb7f2c9c5754808dfc84eb0f':
  Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 17:26:24 +00:00
Jim Miller
a878af34eb am 447264d5: am 807c02ed: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '447264d5728da3cb25a11548c91983253ebd259d':
  Keep unlock attempt count after configuration change
2014-09-11 17:25:39 +00:00
PauloftheWest
8e38f30c26 am 4f006d9d: am e9cb4bf2: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '4f006d9dd14cc5efe0dc454c29d9845ce84cf466':
  Made Bluetooth device dialog fully scrollable.
2014-09-11 17:25:22 +00:00
John Spurlock
b9b559cfa6 am a3eee6fb: am 4fba99a9: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit 'a3eee6fb2d94561f1d2b28be1b6f1255d95fbb29':
  Settings: Remove fixed dropdown width from "From" pref.
2014-09-11 17:25:19 +00:00
Carlos Valdivia
f79797c885 am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit 'ea2fa0d98a9777e37815624bf3e4345b4c6df643':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:25:05 +00:00
PauloftheWest
8e9aef81cf am 94f927b6: am 4e5e8a92: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '94f927b6d54b783651fbde770465b3a9f47468a2':
  Updated Bluetooth keyboard icon to teal.
2014-09-11 17:24:17 +00:00
Jason Monk
becbb93a8d am a9681ddb: am 540743d4: am 062f736c: Adding zen mode condition dialog
* commit 'a9681ddb17398ce36e24e5dae0ea483db5ad7b2f':
  Adding zen mode condition dialog
2014-09-11 17:22:30 +00:00
Fabrice Di Meglio
75cefd093c am e384b253: am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit 'e384b2534b5230d61cfb88e136528002a187533b':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
2014-09-11 17:22:19 +00:00
Carlos Valdivia
ea2fa0d98a am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit 'db591467f6ae0e082c0ce627874a851f1926d63a':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:12:11 +00:00
Carlos Valdivia
db591467f6 am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:05:31 +00:00
Carlos Valdivia
737d2d538b am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '61ced6d4270b86c336520856cb1545865cb01107':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:59:49 +00:00
Carlos Valdivia
61ced6d427 am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '01137c2004a617dae870f9c07b34a29f8706b615':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:49:32 +00:00
Carlos Valdivia
01137c2004 am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:42:54 +00:00
Carlos Valdivia
663b4e9733 am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:37:09 +00:00
Baligh Uddin
e69b7d19f3 am 0d2c8d34: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '0d2c8d34d9f22c0e28682e87133d5dff63feb311':
  Import translations. DO NOT MERGE
2014-09-11 16:04:14 +00:00
Baligh Uddin
0d2c8d34d9 am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
  Import translations. DO NOT MERGE
2014-09-11 15:58:44 +00:00
Baligh Uddin
9b45212b1d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-11 15:49:25 +00:00
Baligh Uddin
330ac54067 Merge "Import translations. DO NOT MERGE" 2014-09-11 15:49:22 +00:00
John Spurlock
aa03280db7 am 2c19551e: am a2f9e2a2: am 1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '2c19551efba348e3e378159bac62980a5fbad91f':
  Settings: Use the same day sequence for downtime.
2014-09-11 14:14:13 +00:00
John Spurlock
c46156277a am 77056e3f: am 740eeb97: am cddb2954: Settings: Make downtime days scrollable.
* commit '77056e3f04dcacea63a7da0cbb3483e91927e3d1':
  Settings: Make downtime days scrollable.
2014-09-11 14:14:12 +00:00
Dan Sandler
89a2ea108d am 2cbeed2f: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '2cbeed2f3e5ffa10bf5031450e1e81b611876c53':
  Show a better list of apps.
2014-09-11 12:16:40 +00:00
Dan Sandler
2cbeed2f3e am 1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '1fb5198732d627baf39492651364c32848abc1f0':
  Show a better list of apps.
2014-09-11 12:06:52 +00:00
Dan Sandler
1fb5198732 Merge "Show a better list of apps." into lmp-dev 2014-09-11 11:58:55 +00:00
Zoltan Szatmary-Ban
ecd8f7aaf1 am 70118662: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '70118662623118ca224fcd929838d1cbb2f9a73e':
  Check for DeviceAdminInfo type before casting
2014-09-11 11:05:40 +00:00
Zoltan Szatmary-Ban
7011866262 am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
  Check for DeviceAdminInfo type before casting
2014-09-11 11:00:28 +00:00
Zoltan Szatmary-Ban
cf911d107a Merge "Check for DeviceAdminInfo type before casting" into lmp-dev 2014-09-11 10:52:57 +00:00
Zoltan Szatmary-Ban
212a2dbb21 am 12b90be9: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '12b90be92b66f96f8ab81cc8938abbac8bd0b429':
  Fixing Trusted Credentials Settings crash
2014-09-11 09:43:33 +00:00
Zoltan Szatmary-Ban
12b90be92b am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
  Fixing Trusted Credentials Settings crash
2014-09-11 09:34:24 +00:00
Zoltan Szatmary-Ban
f572fdd132 Merge "Fixing Trusted Credentials Settings crash" into lmp-dev 2014-09-11 09:23:55 +00:00
Vinit Deshpande
8a7cd97457 Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
This change removes requirement that sender has this permission for
protected broadcasts (since they can only come from framework)

Bug: 17409667

Change-Id: I3431c20a4ed28b3ba2bfc3cf53772e63a3424a2c
2014-09-10 18:38:26 -07:00
Svetoslav
031e8b1432 Fix print icons in settings.
The print icons are in the framework resources and are not tinted
to enable usage from various places such as print spooler and
settings with different tinting. Settings was using not-tinted
print icons which were invisible on the white background. This
change switches settings to user tinted drawables.

bug:16966145

Change-Id: I2cf55d36d90b0192ba23686aac4f1d8e7e23f75a
2014-09-10 18:33:32 -07:00
Fabrice Di Meglio
ab7a2951e0 am 6e0e1483: 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 '6e0e1483a0e3c174920b901cc36bccc2a2059d64':
  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:44:27 +00:00
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