OSDN Git Service
Sanket Padawe [Thu, 11 Jun 2015 21:31:34 +0000 (21:31 +0000)]
Merge "String changes for Cellular data toggle summary." into mnc-dev
Sanket Padawe [Thu, 11 Jun 2015 21:29:30 +0000 (21:29 +0000)]
Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 20:45:09 +0000 (20:45 +0000)]
Merge "Always round migration times up to 1 second." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 20:43:38 +0000 (13:43 -0700)]
Always round migration times up to 1 second.
Bug:
21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
Sanket Padawe [Thu, 11 Jun 2015 20:37:55 +0000 (13:37 -0700)]
String changes for PBAP chekcbox in BT pairing dialog.
Bug:
20488109
Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
Sanket Padawe [Thu, 11 Jun 2015 20:31:39 +0000 (13:31 -0700)]
String changes for Cellular data toggle summary.
Bug:
17073752
Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
Jason Monk [Thu, 11 Jun 2015 19:56:49 +0000 (19:56 +0000)]
Merge "Clean up settings shortcuts" into mnc-dev
Jason Monk [Thu, 11 Jun 2015 19:47:29 +0000 (15:47 -0400)]
Clean up settings shortcuts
- Remove some bad entries
- Fix icons to be top-level item specific
- Add memory
Bug:
20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
Sanket Padawe [Thu, 11 Jun 2015 17:34:38 +0000 (10:34 -0700)]
Fix button layout issue for sv-SE locale.
Bug:
21479378
Change-Id: I4858958a26b183461490c052fece66941314edcc
Jeff Sharkey [Thu, 11 Jun 2015 16:20:22 +0000 (16:20 +0000)]
Merge "Slow dialog string has no limit." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 16:18:00 +0000 (09:18 -0700)]
Slow dialog string has no limit.
Bug:
21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
John Spurlock [Thu, 11 Jun 2015 14:08:44 +0000 (14:08 +0000)]
Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
John Spurlock [Wed, 10 Jun 2015 21:46:58 +0000 (17:46 -0400)]
Settings: Follow frameworks change to volume sliders.
Bug:
21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
Lorenzo Colitti [Thu, 11 Jun 2015 03:06:47 +0000 (03:06 +0000)]
Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev
Sanket Padawe [Thu, 11 Jun 2015 01:41:20 +0000 (01:41 +0000)]
Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
Selim Cinek [Thu, 11 Jun 2015 01:10:49 +0000 (01:10 +0000)]
Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev
Selim Cinek [Thu, 11 Jun 2015 00:42:23 +0000 (17:42 -0700)]
Added setting strings for new fingerprint introduction screen
Bug:
21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
Sanket Padawe [Thu, 11 Jun 2015 00:46:31 +0000 (17:46 -0700)]
Fix SimPreference dialog from closing on orientation change.
Bug:
19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
Jeff Sharkey [Thu, 11 Jun 2015 00:27:44 +0000 (17:27 -0700)]
Follow string refactoring.
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
Jeff Sharkey [Wed, 10 Jun 2015 21:21:19 +0000 (14:21 -0700)]
New strings!
Bug:
21737573,
21666225,
21756698,
21737666,
21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
Lajos Molnar [Wed, 10 Jun 2015 23:23:49 +0000 (23:23 +0000)]
Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
Jorim Jaggi [Wed, 10 Jun 2015 23:10:06 +0000 (23:10 +0000)]
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
Lucky Zhang [Wed, 10 Jun 2015 23:01:25 +0000 (23:01 +0000)]
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
Jorim Jaggi [Tue, 9 Jun 2015 22:31:28 +0000 (15:31 -0700)]
Animations/success state for external confirm device credentials (2/2)
Bug:
20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
Lajos Molnar [Wed, 10 Jun 2015 21:57:48 +0000 (14:57 -0700)]
developer settings: remove "Use deprecated AwesomePlayer" settings
Bug:
17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
Nick Kralevich [Wed, 10 Jun 2015 21:11:31 +0000 (21:11 +0000)]
Merge "Fix USB access control when adb is disabled." into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:26:12 +0000 (20:26 +0000)]
Merge "Hide tap to wake on devices that don't support it" into mnc-dev
Jason Monk [Mon, 8 Jun 2015 13:11:48 +0000 (09:11 -0400)]
Hide tap to wake on devices that don't support it
Bug:
21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
Jason Monk [Wed, 10 Jun 2015 20:12:06 +0000 (20:12 +0000)]
Merge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:08:01 +0000 (16:08 -0400)]
App storage settings - Request size onResume
Our data might be stale (especially when coming from manage space
activities).
Bug:
21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
Jason Monk [Wed, 10 Jun 2015 20:06:09 +0000 (20:06 +0000)]
Merge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 15:03:06 +0000 (11:03 -0400)]
New dialog for ignore battery optimizations
Bug:
21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
Lucky Zhang [Wed, 10 Jun 2015 18:05:09 +0000 (11:05 -0700)]
[Settings] Pass lock type extra back to SUW
When SetupChooseLockGeneric finishes, it will include the lock type
(password quality) as an extra in the returned intent data. This extra
will be used by Setup Wizard to determine the lock type and log it for
the metrics.
Bug:
20349248
Change-Id: I501e07254ab857ad4f137e7050326415853883d1
Jason Monk [Wed, 10 Jun 2015 19:26:35 +0000 (15:26 -0400)]
Add string for profile owner usage access warning
Bug:
20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
Jeff Brown [Wed, 10 Jun 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Add simulated 4K display modes." into mnc-dev
Nick Kralevich [Wed, 10 Jun 2015 16:39:26 +0000 (09:39 -0700)]
Fix USB access control when adb is disabled.
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.
As discussed in bug
21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.
To avoid leaking confidential user photos, we now explicitly unlock
USB data after switching into MTP/PTP mode. Enabling MTP mode is
now decoupled from exposing data on the USB connection.
Bug:
21429947
Change-Id: Id8e9df4ac42fdcf22cc5b75b838bf46f6c225081
Xiyuan Xia [Wed, 10 Jun 2015 17:08:43 +0000 (17:08 +0000)]
Merge "Implement default assist app setting" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 16:39:06 +0000 (16:39 +0000)]
Merge "Show list of permissions instead of just numbers" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 21:55:32 +0000 (14:55 -0700)]
Implement default assist app setting
- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
based on AppListPreferenceWithSettings;
Bug:
20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
Lorenzo Colitti [Wed, 10 Jun 2015 15:25:24 +0000 (15:25 +0000)]
Merge changes from topic 'no-internet-notification' into mnc-dev
* changes:
Pass in the netId using intent data, not intent extras.
Reword "no internet access" dialog to conform with mocks.
Geoff Mendal [Wed, 10 Jun 2015 15:25:01 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 14:02:59 +0000 (10:02 -0400)]
Fix legal info back button
Make it its own SettingsPreferenceFragment.
whitespace--
Bug:
20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
Geoff Mendal [Wed, 10 Jun 2015 15:04:57 +0000 (08:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
Lorenzo Colitti [Wed, 10 Jun 2015 08:03:46 +0000 (17:03 +0900)]
Add a string for switching to cell when Wi-Fi loses backhaul.
We have not yet decided whether to surface this setting, but
we need to get it in before string freeze in case we do want to
expose it.
Bug:
20896761
Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
Lorenzo Colitti [Wed, 10 Jun 2015 13:49:52 +0000 (22:49 +0900)]
Pass in the netId using intent data, not intent extras.
This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.
Bug:
20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9
Lorenzo Colitti [Wed, 10 Jun 2015 06:16:36 +0000 (15:16 +0900)]
Reword "no internet access" dialog to conform with mocks.
Bug:
20081183
Bug:
20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
Chris Wren [Wed, 10 Jun 2015 14:14:38 +0000 (14:14 +0000)]
Merge "annoint new constants" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 13:04:14 +0000 (09:04 -0400)]
Remove periods from ignore optimizations summaries
Bug:
21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
Jason Monk [Wed, 10 Jun 2015 12:59:32 +0000 (12:59 +0000)]
Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:29 +0000 (12:59 +0000)]
Merge "Add sd card string, just in case" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 12:23:45 +0000 (12:23 +0000)]
Merge "Modifications for changes to SettingsLib" into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 01:25:04 +0000 (18:25 -0700)]
Add simulated 4K display modes.
Bug:
18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user
Bug:
21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
Casper Bonde [Fri, 8 May 2015 13:19:03 +0000 (15:19 +0200)]
SAP: Make it possible to enforce a 16-digit pin code (5/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.
This is needed for the SIM access profile.
Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Paul Lawrence [Tue, 9 Jun 2015 20:56:24 +0000 (20:56 +0000)]
Merge "Move CryptKeeper to own process" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:30:34 +0000 (20:30 +0000)]
Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 20:25:32 +0000 (16:25 -0400)]
Add sd card string, just in case
Bug:
21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
Jason Monk [Tue, 9 Jun 2015 20:01:28 +0000 (16:01 -0400)]
Advanced apps updates (2/2)
Change the title of the screen, add a category to break things up
Bug:
21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
Jason Monk [Tue, 9 Jun 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Accounts -> Account sync" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:49:22 +0000 (19:49 +0000)]
Merge "Bring back gear icon for advanced app settings" into mnc-dev
Jason Monk [Tue, 9 Jun 2015 19:45:17 +0000 (15:45 -0400)]
Bring back gear icon for advanced app settings
Bug:
21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
Jason Monk [Tue, 9 Jun 2015 19:32:14 +0000 (15:32 -0400)]
Top level: "Storage" -> "Storage & USB"
Bug:
21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
Jason Monk [Tue, 9 Jun 2015 19:19:11 +0000 (15:19 -0400)]
Add strings that will be used for new ignore opt ux
Bug:
21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
Jason Monk [Tue, 9 Jun 2015 18:46:57 +0000 (14:46 -0400)]
Accounts -> Account sync
Bug:
21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
Chris Wren [Tue, 9 Jun 2015 18:24:03 +0000 (14:24 -0400)]
annoint new constants
Bug:
21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
Tony Mantler [Tue, 9 Jun 2015 17:20:16 +0000 (17:20 +0000)]
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
Sudheer Shanka [Tue, 9 Jun 2015 16:24:13 +0000 (16:24 +0000)]
Merge "Update some strings." into mnc-dev
Chris Wren [Tue, 9 Jun 2015 16:07:14 +0000 (12:07 -0400)]
instrument display rotation settings
Bug:
21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
Chris Wren [Tue, 9 Jun 2015 16:06:54 +0000 (12:06 -0400)]
don't double set the dropdown value
idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.
This makes it hard to count actual user interactions without counting the initialization.
Bug:
21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec
Sudheer Shanka [Tue, 9 Jun 2015 13:26:27 +0000 (14:26 +0100)]
Update some strings.
Bug:
20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
Neil Fuller [Tue, 9 Jun 2015 09:10:56 +0000 (10:10 +0100)]
Modifications for changes to SettingsLib
See associated changes in frameworks/base for details.
Bug:
19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de
Makoto Onuki [Fri, 5 Jun 2015 21:32:10 +0000 (14:32 -0700)]
Show list of permissions instead of just numbers
Bug
21615746
Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
Jim Miller [Wed, 27 May 2015 01:26:11 +0000 (18:26 -0700)]
Update and cleanup FingerprintManager API to new spec
Fixes bug
21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
Tony Mantler [Mon, 8 Jun 2015 21:41:02 +0000 (14:41 -0700)]
Move ApplicationsState to SettingsLib
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/
21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
John Spurlock [Mon, 8 Jun 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 20:50:36 +0000 (16:50 -0400)]
Settings: Update notification listener user prompt strings.
Bug:
20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
Jorim Jaggi [Mon, 8 Jun 2015 18:39:24 +0000 (18:39 +0000)]
Merge "Fix settings overdraw" into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 18:11:15 +0000 (18:11 +0000)]
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
Paul Lawrence [Mon, 8 Jun 2015 18:00:50 +0000 (11:00 -0700)]
Move CryptKeeper to own process
It is possible to run settings from within keyboard, and then find ways of
crashing it. This restarts CryptKeeper since they are one process, with
bad consequences (see bug).
Move to separate process to alleviate this problem
Bug:
21514179
Change-Id: Ib2c19e8f0f3956402cc11a2caedc0a45f786cac3
John Spurlock [Mon, 8 Jun 2015 16:39:32 +0000 (16:39 +0000)]
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 16:30:08 +0000 (09:30 -0700)]
Switch from KeyStore.saw to KeyStore.list.
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.
Bug:
18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
John Spurlock [Thu, 4 Jun 2015 17:01:59 +0000 (13:01 -0400)]
Settings: Update DND access dialog to new user flow.
- Only list apps in the DND access list that have included
the corresponding permission in their manifest.
- Show a scary user warning before enabling access per app.
- Update manifest to follow framework intent action rename.
Bug:
21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
Geoff Mendal [Mon, 8 Jun 2015 14:59:45 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
Martijn Coenen [Mon, 8 Jun 2015 08:02:28 +0000 (08:02 +0000)]
Merge "Add NFC payment "how it works" screens." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:01:45 +0000 (08:01 +0000)]
Merge "NFC: don't use dynamic resources." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:58:18 +0000 (01:58 +0000)]
Merge "Fix wifi network strings shown in Settings." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:49:12 +0000 (18:49 -0700)]
Fix wifi network strings shown in Settings.
Bug:
21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
Jorim Jaggi [Sat, 6 Jun 2015 00:42:32 +0000 (17:42 -0700)]
Fix settings overdraw
Bug:
17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
Ruben Brunk [Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
Ruben Brunk [Thu, 4 Jun 2015 01:53:40 +0000 (18:53 -0700)]
Add UI for camera + flashlight battery reporting.
Bug:
11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
Martijn Coenen [Fri, 5 Jun 2015 19:28:17 +0000 (21:28 +0200)]
Add NFC payment "how it works" screens.
Bug:
21239081
Bug:
21305138
Bug:
21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
Maurice Lam [Fri, 5 Jun 2015 19:13:17 +0000 (19:13 +0000)]
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:12:16 +0000 (18:12 +0000)]
Merge "Fix lockpattern weirdness" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:37:04 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
Merge "Settings > Apps list style updates" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:23:12 +0000 (13:23 +0000)]
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
Martijn Coenen [Fri, 5 Jun 2015 09:36:50 +0000 (11:36 +0200)]
NFC: don't use dynamic resources.
Also fixed talk-back for the default
payment app selection.
Bug:
21343778
Bug:
21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
Jorim Jaggi [Fri, 5 Jun 2015 01:00:34 +0000 (18:00 -0700)]
Fix lockpattern weirdness
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug:
21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
Maurice Lam [Fri, 5 Jun 2015 00:17:07 +0000 (17:17 -0700)]
Update Setup Wizard redaction interstitial styles
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug:
21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70