PauloftheWest
9f96ac6f73
am 37b1253a
: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
...
* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
2014-09-12 17:27:25 +00:00
Alexandra Gherghina
f738895dc0
Merge "Switch to using system-wide default user icons" into lmp-dev
2014-09-12 16:03:53 +00:00
Alexandra Gherghina
bc6e78f9da
Switch to using system-wide default user icons
...
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.
Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
2014-09-12 17:00:40 +01:00
PauloftheWest
7e6e7acbf1
Updated Wi-Fi Settings icons to new filled-in teal format.
...
+ Added a filled-in teal Wi-Fi unlocked and locked icons.
+ Added a teal theme to Settings.
+ Updated Wi-Fi Settings and Setup Wizard to use the new teal format.
+ Updated the Settings icon (used in the Settings dashboard and in
search) to the new format.
Bug: 17331199
Change-Id: I0565ef6f2fa1be035c1bd150ea853cb976dc504c
2014-09-12 07:18:10 -07:00
Dianne Hackborn
c857cddf89
am 364ca371
: am a5780340
: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
...
* commit '364ca371a38b1f844f1f1e614133f0592fe04001':
Fix some things in settings: manage apps, battery, procstats
2014-09-12 13:59:18 +00:00
Svetoslav
c33aef207e
am c50841ca
: am 85dcef12
: Fix settings crash in print job screen.
...
* commit 'c50841caa924f6c3af92c10d377b336e6cc6641d':
Fix settings crash in print job screen.
2014-09-12 13:59:18 +00:00
Vinit Deshpande
7aaccec09c
am c471629c
: am 0a11f605
: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit 'c471629c7d98403be92a1cb30f04612a9d12b7bc':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-12 13:59:17 +00:00
Svetoslav
536cb798f3
am 842e9d04
: am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '842e9d04ade970409f930686d875644e3d827e19':
Fix print icons in settings.
2014-09-12 13:59:16 +00:00
Carlos Valdivia
456fbe88d0
am a8627dd8
: am f79797c8
: 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 'a8627dd88e7632e452806a70b62c192111b30c57':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-12 13:59:15 +00:00
Baligh Uddin
f053f532ce
am a2e918af
: (-s ours) am 9b45212b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'a2e918af43fc011e49c39187e55e0707789438b9':
Import translations. DO NOT MERGE
2014-09-12 13:59:14 +00:00
Dan Sandler
99e467a75e
am e98bee54
: am 1fb51987
: Merge "Show a better list of apps." into lmp-dev
...
* commit 'e98bee54be5b8ca17e5860d34bac9d56116777d9':
Show a better list of apps.
2014-09-12 13:59:13 +00:00
Zoltan Szatmary-Ban
118cf516c2
am 55cd479d
: am cf911d10
: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit '55cd479d5511d9806a129cc4b40be7df79955197':
Check for DeviceAdminInfo type before casting
2014-09-12 13:59:12 +00:00
Zoltan Szatmary-Ban
b2259b3a55
am b46eeeb7
: am f572fdd1
: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'b46eeeb7be7dbf7b791c0527e096771032112321':
Fixing Trusted Credentials Settings crash
2014-09-12 13:59:11 +00:00
Fabrice Di Meglio
a2bba88bc8
am b88d24df
: 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 'b88d24df0e0c804cf9c742411e4a6809ead3f020':
Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released
2014-09-12 13:59:10 +00:00
PauloftheWest
c1806600c4
am 23d0ac44
: am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit '23d0ac449119cb30de08d03fb38f92e87c9009ed':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-12 13:59:09 +00:00
Jim Miller
825eb63c1b
am f496ae94
: am ca03758e
: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit 'f496ae94138e44d623819afdc4d0893acb27f3fc':
Keep unlock attempt count after configuration change
2014-09-12 13:59:09 +00:00
Baligh Uddin
6f96fcc5a3
am 321b25a1
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '321b25a1443b71316462ad0fea675f539501d8f0':
Import translations. DO NOT MERGE
2014-09-12 13:59:08 +00:00
PauloftheWest
37b1253a01
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
2014-09-12 13:06:42 +00:00
Dianne Hackborn
364ca371a3
am a5780340
: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
...
* commit 'a5780340fcf8f8910f1aa1197c604be32ff6a5cf':
Fix some things in settings: manage apps, battery, procstats
2014-09-12 07:28:47 +00:00
Svetoslav
c50841caa9
am 85dcef12
: Fix settings crash in print job screen.
...
* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
2014-09-12 07:24:46 +00:00
Dianne Hackborn
a5780340fc
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
2014-09-12 02:24:17 +00:00
Dianne Hackborn
c891ce6565
Fix some things in settings: manage apps, battery, procstats
...
Issue #17461567 : java.lang.ArithmeticException: divide by zero when
looking at Settings > Battery
Yeah, let's not do that.
Issue #17365562 : Running services RAM totals are wrong
Okay so like a few months ago, I had this vacation coming up, and
it was around the feature complete (hahah) deadline, and I had to
rush to get this in before I left. So I rushed. And, well, I forgot
a few things. Here they are. We now show the right numbers and
even update things correctly when you change what processes are
being shown. Wow.
Finally, fixed a few issues in the dev tools procstats UI.
Change-Id: I8348a9c2ec3226a455c5c8465729e4487f324c8b
2014-09-11 18:09:29 -07:00
Svetoslav
85dcef1226
Fix settings crash in print job screen.
...
The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.
bug:17471952
Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0
2014-09-11 14:30:18 -07:00
PauloftheWest
8d6991348b
Fixed multiple Bluetooth Settings crashes.
...
+ Fixed a crash when selecting On/Off multiple times on an input device.
+ Fixed a crash when visiting different Bluetooth Settings after
disabling an input device.
Bug: 17402421
Change-Id: I23efa3a36ba8cf0df02cf41397586a10dae9e08c
2014-09-11 12:36:58 -07:00
Vinit Deshpande
c471629c7d
am 0a11f605
: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:25:46 +00:00
Vinit Deshpande
0a11f60595
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
2014-09-11 18:17:00 +00:00
Svetoslav
842e9d04ad
am 72cfbcb4
: Merge "Fix print icons in settings." into lmp-dev
...
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
2014-09-11 17:39:26 +00:00
Carlos Valdivia
a8627dd88e
am f79797c8
: 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 'f79797c8853741e80668f1d91c4d7d1a076bac18':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:39:25 +00:00
Svetoslav
72cfbcb429
Merge "Fix print icons in settings." into lmp-dev
2014-09-11 17:28:32 +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
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
a2e918af43
am 9b45212b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
2014-09-11 16:11:13 +00:00
Dan Sandler
e98bee54be
am 1fb51987
: Merge "Show a better list of apps." into lmp-dev
...
* commit '1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
2014-09-11 16:01:27 +00:00
Zoltan Szatmary-Ban
55cd479d55
am cf911d10
: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
...
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
2014-09-11 16:01:24 +00:00
Zoltan Szatmary-Ban
b46eeeb7be
am f572fdd1
: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
...
* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
2014-09-11 16:01:14 +00:00
Fabrice Di Meglio
b88d24df0e
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 15:59:01 +00:00
PauloftheWest
23d0ac4491
am b2197d90
: Added bluetooth_device_settings_header to fix build breakage.
...
* commit 'b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
2014-09-11 15:58:20 +00:00
Jim Miller
f496ae9413
am ca03758e
: Merge "Keep unlock attempt count after configuration change" into lmp-dev
...
* commit 'ca03758ed6399d73c841bec8685ea1f19bf38fea':
Keep unlock attempt count after configuration change
2014-09-11 15:57:42 +00:00
Baligh Uddin
9b45212b1d
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-11 15:49:25 +00:00
Baligh Uddin
321b25a144
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-09-11 15:49:24 +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
cf911d107a
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
2014-09-11 10:52:57 +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