OSDN Git Service
Tyler Gunn [Sat, 13 Sep 2014 17:47:28 +0000 (17:47 +0000)]
am
3e71b197: Renaming Telecomm to Telecom.
* commit '
3e71b197f7f85c5045a083ecc532954958807be6':
Renaming Telecomm to Telecom.
Tyler Gunn [Wed, 10 Sep 2014 22:21:33 +0000 (15:21 -0700)]
Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug:
17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
Paul Lawrence [Fri, 12 Sep 2014 22:05:22 +0000 (22:05 +0000)]
am
c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '
c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
Prevent PIN/Passwword disappearing during boot
Paul Lawrence [Fri, 12 Sep 2014 21:44:48 +0000 (21:44 +0000)]
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 19:37:38 +0000 (19:37 +0000)]
am
db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '
db9e3f682fd251a9c996141af73b285974dd9d1c':
Fix crash when showing accounts.
Paul Lawrence [Wed, 14 May 2014 20:57:06 +0000 (13:57 -0700)]
Prevent PIN/Passwword disappearing during boot
During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.
Ignore this change since it is immaterial to what we display.
Bug:
17421115
Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276
Kenny Guy [Fri, 12 Sep 2014 19:17:09 +0000 (19:17 +0000)]
Merge "Fix crash when showing accounts." into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 18:49:11 +0000 (19:49 +0100)]
Fix crash when showing accounts.
Accounts page crashed when showing a disabled
manged profile.
Bug:
17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33
Alexandra Gherghina [Fri, 12 Sep 2014 17:31:21 +0000 (17:31 +0000)]
am
f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '
f738895dc06c5afd6c9525e49eaa50566580d8d6':
Switch to using system-wide default user icons
PauloftheWest [Fri, 12 Sep 2014 17:31:20 +0000 (17:31 +0000)]
am
37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '
37b1253a0195392c13661ad4504e8b8ef3af2ef4':
Fixed multiple Bluetooth Settings crashes.
Alexandra Gherghina [Fri, 12 Sep 2014 16:03:52 +0000 (16:03 +0000)]
Merge "Switch to using system-wide default user icons" into lmp-dev
Alexandra Gherghina [Wed, 3 Sep 2014 09:22:09 +0000 (10:22 +0100)]
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
PauloftheWest [Fri, 12 Sep 2014 13:06:41 +0000 (13:06 +0000)]
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 05:09:07 +0000 (05:09 +0000)]
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
Svetoslav [Fri, 12 Sep 2014 05:06:32 +0000 (05:06 +0000)]
am
85dcef12: Fix settings crash in print job screen.
* commit '
85dcef12263f3cbae05240a155e92e7cf386d58f':
Fix settings crash in print job screen.
Dianne Hackborn [Fri, 12 Sep 2014 02:24:16 +0000 (02:24 +0000)]
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 01:09:29 +0000 (18:09 -0700)]
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
Svetoslav [Thu, 11 Sep 2014 21:30:13 +0000 (14:30 -0700)]
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
PauloftheWest [Wed, 10 Sep 2014 13:45:00 +0000 (06:45 -0700)]
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
Vinit Deshpande [Thu, 11 Sep 2014 18:25:06 +0000 (18:25 +0000)]
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
Vinit Deshpande [Thu, 11 Sep 2014 18:16:59 +0000 (18:16 +0000)]
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
Svetoslav [Thu, 11 Sep 2014 17:40:06 +0000 (17:40 +0000)]
am
72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '
72cfbcb42952a8799daa497bf8034b2f033fad9e':
Fix print icons in settings.
Carlos Valdivia [Thu, 11 Sep 2014 17:40:03 +0000 (17:40 +0000)]
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.
Svetoslav [Thu, 11 Sep 2014 17:28:30 +0000 (17:28 +0000)]
Merge "Fix print icons in settings." into lmp-dev
Carlos Valdivia [Thu, 11 Sep 2014 17:25:05 +0000 (17:25 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 17:12:11 +0000 (17:12 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
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.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
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.
Baligh Uddin [Thu, 11 Sep 2014 15:58:44 +0000 (15:58 +0000)]
am
9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9b45212b1ddafd923bf785a754add5ac256ce624':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Dan Sandler [Thu, 11 Sep 2014 12:06:52 +0000 (12:06 +0000)]
am
1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit '
1fb5198732d627baf39492651364c32848abc1f0':
Show a better list of apps.
Dan Sandler [Thu, 11 Sep 2014 11:58:54 +0000 (11:58 +0000)]
Merge "Show a better list of apps." into lmp-dev
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 11:00:28 +0000 (11:00 +0000)]
am
cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit '
cf911d107ac931306af80fd02eb696410bb2aaad':
Check for DeviceAdminInfo type before casting
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 10:52:56 +0000 (10:52 +0000)]
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 09:34:24 +0000 (09:34 +0000)]
am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
f572fdd132c796448064f919dcbe22ae70659aa8':
Fixing Trusted Credentials Settings crash
Zoltan Szatmary-Ban [Thu, 11 Sep 2014 09:23:53 +0000 (09:23 +0000)]
Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
Vinit Deshpande [Thu, 11 Sep 2014 01:38:26 +0000 (18:38 -0700)]
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
Svetoslav [Thu, 11 Sep 2014 01:33:25 +0000 (18:33 -0700)]
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
Fabrice Di Meglio [Thu, 11 Sep 2014 00:34:23 +0000 (00:34 +0000)]
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
Fabrice Di Meglio [Thu, 11 Sep 2014 00:23:32 +0000 (00:23 +0000)]
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
Fabrice Di Meglio [Wed, 10 Sep 2014 23:35:36 +0000 (16:35 -0700)]
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
PauloftheWest [Wed, 10 Sep 2014 23:33:20 +0000 (23:33 +0000)]
am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
b2197d90a8f173ef6ca3071aa434cc7283f85a42':
Added bluetooth_device_settings_header to fix build breakage.
PauloftheWest [Wed, 10 Sep 2014 22:51:47 +0000 (15:51 -0700)]
Added bluetooth_device_settings_header to fix build breakage.
Change-Id: Ieca78c6bc34119e0cccc51a27cbcbf966b913bb1
Jim Miller [Wed, 10 Sep 2014 22:28:48 +0000 (22:28 +0000)]
am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
ca03758ed6399d73c841bec8685ea1f19bf38fea':
Keep unlock attempt count after configuration change
Jim Miller [Wed, 10 Sep 2014 22:18:22 +0000 (22:18 +0000)]
Merge "Keep unlock attempt count after configuration change" into lmp-dev
PauloftheWest [Wed, 10 Sep 2014 22:17:25 +0000 (22:17 +0000)]
am
1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '
1675c786bfe213cce0d454d9eaf5fb51b4b4520c':
Made Bluetooth device dialog fully scrollable.
PauloftheWest [Wed, 10 Sep 2014 22:11:56 +0000 (22:11 +0000)]
Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
John Spurlock [Wed, 10 Sep 2014 22:06:16 +0000 (22:06 +0000)]
am
31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '
31915522b764a097c5d660cb933d4acb5eb0fcb4':
Settings: Remove fixed dropdown width from "From" pref.
John Spurlock [Wed, 10 Sep 2014 21:49:28 +0000 (17:49 -0400)]
Settings: Remove fixed dropdown width from "From" pref.
Bug:
17457729
Change-Id: I99d294f43211765e410af53e87bb96b06715c0e3
PauloftheWest [Wed, 10 Sep 2014 21:44:16 +0000 (21:44 +0000)]
am
8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '
8b7d27cb78b09d9b2b2f4185308a042f471276ef':
Updated Bluetooth keyboard icon to teal.
PauloftheWest [Wed, 10 Sep 2014 21:35:15 +0000 (21:35 +0000)]
Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
PauloftheWest [Wed, 10 Sep 2014 17:29:19 +0000 (10:29 -0700)]
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
PauloftheWest [Wed, 10 Sep 2014 21:21:44 +0000 (14:21 -0700)]
Updated Bluetooth keyboard icon to teal.
Bug:
17140804
Change-Id: I59a4c0ff81b723ff4676b607e3da6cdc5c73625e
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
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
f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)
Jorim Jaggi [Tue, 9 Sep 2014 16:25:46 +0000 (18:25 +0200)]
Keep unlock attempt count after configuration change
Bug:
17416448
Change-Id: I79839a5e8020b184dd8928b47fc018d5209988ed
Jason Monk [Wed, 10 Sep 2014 20:42:47 +0000 (20:42 +0000)]
am
062f736c: Adding zen mode condition dialog
* commit '
062f736c8bfda9ac6ac7476ad51e52ca077f1505':
Adding zen mode condition dialog
Jason Monk [Mon, 8 Sep 2014 14:16:06 +0000 (10:16 -0400)]
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
Fabrice Di Meglio [Wed, 10 Sep 2014 20:22:56 +0000 (20:22 +0000)]
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
Fabrice Di Meglio [Wed, 10 Sep 2014 20:14:15 +0000 (20:14 +0000)]
Merge "Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
Fabrice Di Meglio [Wed, 10 Sep 2014 20:12:25 +0000 (13:12 -0700)]
Fix bug #
17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
- add missing string
Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
Dan Sandler [Wed, 10 Sep 2014 13:54:28 +0000 (09:54 -0400)]
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
John Spurlock [Wed, 10 Sep 2014 17:06:05 +0000 (17:06 +0000)]
am
1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '
1e7dbd455eade6e6d8f1abd7969dd096972ed84f':
Settings: Use the same day sequence for downtime.
John Spurlock [Wed, 10 Sep 2014 17:06:05 +0000 (17:06 +0000)]
am
cddb2954: Settings: Make downtime days scrollable.
* commit '
cddb29544ae4b7c67c3885eda7d2a485cceb53e6':
Settings: Make downtime days scrollable.
John Spurlock [Wed, 10 Sep 2014 15:38:30 +0000 (11:38 -0400)]
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
John Spurlock [Wed, 10 Sep 2014 14:04:44 +0000 (10:04 -0400)]
Settings: Make downtime days scrollable.
Bug:
17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
Zoltan Szatmary-Ban [Wed, 10 Sep 2014 11:22:36 +0000 (12:22 +0100)]
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
Matthew Xie [Wed, 10 Sep 2014 00:56:07 +0000 (00:56 +0000)]
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
Matthew Xie [Wed, 10 Sep 2014 00:48:40 +0000 (00:48 +0000)]
Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
Carlos Valdivia [Wed, 10 Sep 2014 00:22:36 +0000 (00:22 +0000)]
am
af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '
af85b740461b69d9b52d6d19a81d06f3a15b6507':
SECURITY: Prevent preference intents from exploiting settings.
Carlos Valdivia [Wed, 10 Sep 2014 00:16:15 +0000 (00:16 +0000)]
Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
Matthew Xie [Tue, 9 Sep 2014 05:30:18 +0000 (22:30 -0700)]
Do not remove bonded devices from cached device list upon a device scan
Bug:
17405122
Change-Id: I3f5cc6ddc8f85d3b6223f9ff60e1d5eeb76c530a
Elliott Hughes [Tue, 9 Sep 2014 21:56:01 +0000 (21:56 +0000)]
am
a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '
a6e57b88ffa2af3014a3f689e3d08c7b77c9a64d':
Always use the LocalePicker's preferred locale names.
Elliott Hughes [Tue, 9 Sep 2014 21:49:39 +0000 (21:49 +0000)]
Merge "Always use the LocalePicker's preferred locale names." into lmp-dev
Elliott Hughes [Tue, 9 Sep 2014 21:33:11 +0000 (14:33 -0700)]
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
Jorim Jaggi [Tue, 9 Sep 2014 21:29:14 +0000 (21:29 +0000)]
am
b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '
b2bea36bb51af63a5e65cedbf49c3ccdd5a7507c':
Fix layout issues with landscape pattern/password layouts
Jorim Jaggi [Tue, 9 Sep 2014 21:18:38 +0000 (21:18 +0000)]
Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
Jorim Jaggi [Tue, 9 Sep 2014 16:25:46 +0000 (18:25 +0200)]
Fix layout issues with landscape pattern/password layouts
Bug:
17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
PauloftheWest [Tue, 9 Sep 2014 20:51:57 +0000 (20:51 +0000)]
am
654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '
654517a510dd4f655a468ad0083d04929338a7df':
Fixed a Null Pointer Error in Bluetooth Settings.
PauloftheWest [Tue, 9 Sep 2014 20:45:59 +0000 (20:45 +0000)]
Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
Amith Yamasani [Tue, 9 Sep 2014 20:35:48 +0000 (20:35 +0000)]
am
67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '
6707999600129286ad362bfc2974e321ff06ec90':
Handle disallowed NFC beam restriction
Adam Lesinski [Tue, 9 Sep 2014 20:35:47 +0000 (20:35 +0000)]
am
3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '
3649045d109090f8e5951414179fa87dd68ed519':
Make UsageAccess WarningDialog actually instatiatable.
Amith Yamasani [Tue, 9 Sep 2014 20:30:35 +0000 (20:30 +0000)]
Merge "Handle disallowed NFC beam restriction" into lmp-dev
Adam Lesinski [Tue, 9 Sep 2014 20:30:11 +0000 (20:30 +0000)]
Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
Amith Yamasani [Tue, 9 Sep 2014 19:07:11 +0000 (12:07 -0700)]
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
Adam Lesinski [Tue, 9 Sep 2014 18:34:55 +0000 (11:34 -0700)]
Make UsageAccess WarningDialog actually instatiatable.
The DialogFragment used for WarningDialog was not instatiatable
by the fragment manager.
Bug:
17435234
Change-Id: I5f65dd1e0ec0b95d048934480bd5fafd8648ab7c
Carlos Valdivia [Tue, 9 Sep 2014 03:12:24 +0000 (20:12 -0700)]
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
PauloftheWest [Tue, 9 Sep 2014 18:09:00 +0000 (18:09 +0000)]
am
29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '
29a9c6844b04415505a9a3e9212f85432492702e':
Removed connect button from Saved Networks dialog.
PauloftheWest [Tue, 9 Sep 2014 18:00:49 +0000 (18:00 +0000)]
Merge "Removed connect button from Saved Networks dialog." into lmp-dev
PauloftheWest [Tue, 9 Sep 2014 17:04:46 +0000 (10:04 -0700)]
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
Zoltan Szatmary-Ban [Tue, 9 Sep 2014 11:12:09 +0000 (11:12 +0000)]
am
574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '
574db4269528c7277f6e14a44156909fdb063190':
Update Trusted Credentials screen in settings
Zoltan Szatmary-Ban [Tue, 9 Sep 2014 11:05:54 +0000 (11:05 +0000)]
Merge "Update Trusted Credentials screen in settings" into lmp-dev
Baligh Uddin [Tue, 9 Sep 2014 05:39:52 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I218cab3789ccb371b7ca9cd77388932b88ec5ab1
Auto-generated-cl: translation import
Elliott Hughes [Mon, 8 Sep 2014 23:39:56 +0000 (23:39 +0000)]
am
5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '
5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
Start cleaning up percentage formatting in Settings.
Elliott Hughes [Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)]
Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
PauloftheWest [Fri, 5 Sep 2014 13:54:39 +0000 (06:54 -0700)]
Removed connect button from Saved Networks dialog.
Bug:
17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
PauloftheWest [Mon, 8 Sep 2014 22:51:29 +0000 (22:51 +0000)]
am
bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '
bec89d797b6f2680c544639faed7e47573625e11':
Fixed scrolling on the Wi-Fi Settings Dialog.
PauloftheWest [Mon, 8 Sep 2014 22:34:50 +0000 (22:34 +0000)]
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev