OSDN Git Service
Svetoslav [Fri, 19 Sep 2014 21:15:48 +0000 (14:15 -0700)]
Crash in Settings cancelling a print job from the job list.
bug:
17585582
Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 10:27:46 +0000 (10:27 +0000)]
Merge "Show Power usage details for the correct user" into lmp-dev
Matthew Xie [Fri, 19 Sep 2014 00:23:34 +0000 (00:23 +0000)]
Merge "Do not overwrite alias with device name" into lmp-dev
Matthew Xie [Thu, 18 Sep 2014 05:43:49 +0000 (22:43 -0700)]
Do not overwrite alias with device name
Bug:
17287682
Change-Id: Iea29e85125ae4720fd99f893f516c301b7aed7c6
PauloftheWest [Thu, 18 Sep 2014 15:51:49 +0000 (15:51 +0000)]
Merge "Removed an extraneous messge when pairing." into lmp-dev
Sander Alewijnse [Thu, 18 Sep 2014 11:36:30 +0000 (11:36 +0000)]
Merge "Update targetSdkVersion check." into lmp-dev
Zoltan Szatmary-Ban [Thu, 18 Sep 2014 09:26:11 +0000 (10:26 +0100)]
Show Power usage details for the correct user
Settings > Battery > Details has to observe managed profiles and start the
Power Usage Detail fragment for the correct profile.
Bug:
17523189
Change-Id: I7a47b972a8a0492b4a411197cd2c8c65f24c2e7e
Mark Salyzyn [Wed, 17 Sep 2014 21:05:15 +0000 (14:05 -0700)]
logd: settings: ro.config.low_ram support
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug:
17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
PauloftheWest [Tue, 16 Sep 2014 19:29:17 +0000 (12:29 -0700)]
Removed an extraneous messge when pairing.
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug:
17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
Amith Yamasani [Wed, 17 Sep 2014 20:06:59 +0000 (20:06 +0000)]
Merge "Don't allow creating a guest from a secondary user..." into lmp-dev
John Spurlock [Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
John Spurlock [Wed, 17 Sep 2014 16:55:17 +0000 (12:55 -0400)]
Settings: Ensure CryptKeeper dismisses secure keyguards.
Otherwise, the lockscreen can be shown during the decryption
challenge, which hides the challenge activity window until
the next reboot.
Bug:
17512377
Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af
PauloftheWest [Wed, 17 Sep 2014 15:30:09 +0000 (08:30 -0700)]
Increase char limit for translation.
Bug:
17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
Amith Yamasani [Tue, 16 Sep 2014 23:36:40 +0000 (16:36 -0700)]
Don't allow creating a guest from a secondary user...
unless the primary user has allowed Guest and user creation from
lockscreen.
Bug:
17482220
Change-Id: Idd05889da330d6cbe0d3ccab2e98abfdeba94b96
Maurice Lam [Tue, 16 Sep 2014 18:35:38 +0000 (18:35 +0000)]
Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
Maurice Lam [Tue, 16 Sep 2014 03:40:26 +0000 (20:40 -0700)]
[WifiSetup] Update connection state for auto-finish
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.
Bug:
17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
Baligh Uddin [Tue, 16 Sep 2014 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Tue, 16 Sep 2014 02:13:29 +0000 (02:13 +0000)]
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
Edward Jee [Mon, 8 Sep 2014 23:45:29 +0000 (16:45 -0700)]
Migrates PBAP and MAP access permission data from Settings to Bluetooth.
Currently, users' preference in phonebook and call history or message
access per each Bluetooth-paired device is stored in Settings application's
shared preferences.
However, some privileged applications other than Settings need to access
such data. So we decided to migrate the data from Settings application's
shared preferences to Bluetooth application's.
Bug:
17158953
Change-Id: I44fde350ea35027df0de77feec1ea19c65f2f1c6
Edward Jee [Tue, 16 Sep 2014 01:19:07 +0000 (01:19 +0000)]
Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 16:27:25 +0000 (09:27 -0700)]
Alignment updates for Wi-Fi Settings dialog.
Bug:
17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
Edward Jee [Fri, 5 Sep 2014 05:18:21 +0000 (22:18 -0700)]
Do not show phonebook access permission dialog if pairing dialog has already been shown.
Bug:
16964116,
13886947,
16345619
Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
PauloftheWest [Mon, 15 Sep 2014 21:25:13 +0000 (21:25 +0000)]
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Little more on issue #
17495264: tweak when we ignore initial times.
Change-Id: I7053eb64d7d2281984baef9606334c2df4783cc5
Dianne Hackborn [Mon, 15 Sep 2014 20:51:46 +0000 (20:51 +0000)]
Merge "Fix issue #
17495264: Battery history graph is bad" into lmp-dev
Maurice Lam [Mon, 15 Sep 2014 18:40:34 +0000 (11:40 -0700)]
[WifiSetup] Disable app starting window
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.
Bug:
17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
Sander Alewijnse [Mon, 15 Sep 2014 14:44:01 +0000 (15:44 +0100)]
Update targetSdkVersion check.
Bug:
16509819
Change-Id: Ibc0afd234eaa13c1862c8e8dd60d68940aa559f5
PauloftheWest [Thu, 11 Sep 2014 23:10:18 +0000 (16:10 -0700)]
Removed all references to "Google Wi-Fi Assistant" from Settings.
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card. Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.
Bug:
17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
PauloftheWest [Mon, 15 Sep 2014 14:35:45 +0000 (14:35 +0000)]
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
Baligh Uddin [Mon, 15 Sep 2014 06:05:45 +0000 (23:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8afcd11572e8785a6ded163f1fb9d267730fa9a1
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 14 Sep 2014 21:39:52 +0000 (14:39 -0700)]
Fix issue #
17495264: Battery history graph is bad
Deal better with wall clock time changes in the battery history.
Change-Id: I9d63edafc37bbf663e328a08ba09300be2142594
Prem Kumar [Sun, 14 Sep 2014 23:51:21 +0000 (23:51 +0000)]
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 19:36:18 +0000 (19:36 +0000)]
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 15:20:37 +0000 (11:20 -0400)]
Settings: Use new PowerManager call to set low power mode.
Bind the master switch to the power manager state instead
of directly to the single setting.
Depends on frameworks/base change:
Ic030504c9cad9868a7137abbe837b170da37852b
Bug:
17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a
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 21:44:48 +0000 (21:44 +0000)]
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
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 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 [Thu, 11 Sep 2014 22:21:00 +0000 (15:21 -0700)]
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
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 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: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: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:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
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 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: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: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 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:18:22 +0000 (22:18 +0000)]
Merge "Keep unlock attempt count after configuration change" into lmp-dev
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 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: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 [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: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 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: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: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: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: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: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: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: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: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: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:34:50 +0000 (22:34 +0000)]
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev