Jeff Sharkey
f25fc9cb67
Merge "Always round migration times up to 1 second." into mnc-dev
2015-06-11 20:45:09 +00:00
Jeff Sharkey
5693274d2a
Always round migration times up to 1 second.
...
Bug: 21755250
Change-Id: I4e5eef493f2f923d0bcf110133e862c4a4a7db8b
2015-06-11 13:43:56 -07:00
Jason Monk
0011604fd1
Merge "Clean up settings shortcuts" into mnc-dev
2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2
Clean up settings shortcuts
...
- Remove some bad entries
- Fix icons to be top-level item specific
- Add memory
Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
2015-06-11 15:47:29 -04:00
Paul Jensen
6953eea28b
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
...
Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
2015-06-11 10:26:33 -04:00
John Spurlock
fca81cd233
Merge "Settings: Follow frameworks change to volume sliders." into mnc-dev
2015-06-11 14:08:46 +00:00
John Spurlock
f82154de8c
Settings: Follow frameworks change to volume sliders.
...
Bug: 21267436
Change-Id: I72c6411346429ebf428662d1c6d6d8a7529c0d67
2015-06-11 10:06:30 -04:00
Sanket Padawe
1d220f6242
Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev
2015-06-11 01:41:21 +00:00
Sanket Padawe
f6f43e4c45
Fix SimPreference dialog from closing on orientation change.
...
Bug: 19041463
Change-Id: I8c91fd6f01bbeb7561365dbb76ba3d4c05b76efc
2015-06-10 17:46:31 -07:00
Jeff Sharkey
680329f10c
Follow string refactoring.
...
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
2015-06-10 17:27:44 -07:00
Lajos Molnar
63504d8326
Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
2015-06-10 23:23:49 +00:00
Jorim Jaggi
ed76e59e49
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev
2015-06-10 23:10:08 +00:00
Lucky Zhang
34450932b2
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
2015-06-10 23:01:26 +00:00
Jorim Jaggi
ff41a9a5a6
Animations/success state for external confirm device credentials (2/2)
...
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297
developer settings: remove "Use deprecated AwesomePlayer" settings
...
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
2015-06-10 15:00:13 -07:00
Nick Kralevich
8da8e52874
Merge "Fix USB access control when adb is disabled." into mnc-dev
2015-06-10 21:11:35 +00:00
Jason Monk
a576d55a0e
Merge "Hide tap to wake on devices that don't support it" into mnc-dev
2015-06-10 20:26:12 +00:00
Jason Monk
181e0e9ec0
Hide tap to wake on devices that don't support it
...
Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
2015-06-10 16:16:10 -04:00
Jason Monk
dc748cb38a
Merge "App storage settings - Request size onResume" into mnc-dev
2015-06-10 20:12:07 +00:00
Jason Monk
ece9d5145f
App storage settings - Request size onResume
...
Our data might be stale (especially when coming from manage space
activities).
Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
2015-06-10 16:08:01 -04:00
Jason Monk
d09be7ed30
Merge "New dialog for ignore battery optimizations" into mnc-dev
2015-06-10 20:06:12 +00:00
Jason Monk
3a90d7cc69
New dialog for ignore battery optimizations
...
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
2015-06-10 15:49:36 -04:00
Lucky Zhang
1bb5648595
[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
2015-06-10 12:42:15 -07:00
Nick Kralevich
5eba30289a
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
2015-06-10 10:24:05 -07:00
Xiyuan Xia
9823f27936
Merge "Implement default assist app setting" into mnc-dev
2015-06-10 17:08:44 +00:00
Makoto Onuki
0bd18745cf
Merge "Show list of permissions instead of just numbers" into mnc-dev
2015-06-10 16:39:07 +00:00
Xiyuan Xia
86a554091d
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
2015-06-10 08:43:28 -07:00
Lorenzo Colitti
275e6f7520
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.
2015-06-10 15:25:27 +00:00
Jason Monk
f94023216a
Fix legal info back button
...
Make it its own SettingsPreferenceFragment.
whitespace--
Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
2015-06-10 11:05:02 -04:00
Lorenzo Colitti
2593589209
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
2015-06-10 23:38:16 +09:00
Lorenzo Colitti
dcc6155426
Reword "no internet access" dialog to conform with mocks.
...
Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
2015-06-10 23:38:09 +09:00
Chris Wren
da6a4904a9
Merge "annoint new constants" into mnc-dev
2015-06-10 14:14:45 +00:00
Jason Monk
cc0f3b75b2
Merge "Advanced apps updates (2/2)" into mnc-dev
2015-06-10 12:59:33 +00:00
Neil Fuller
c28330ec3e
Merge "Modifications for changes to SettingsLib" into mnc-dev
2015-06-10 12:23:49 +00:00
Fyodor Kupolov
8e2c478701
Merge "Guest option should not be shown for the guest user" into mnc-dev
2015-06-09 22:57:27 +00:00
Fyodor Kupolov
c478885d8d
Guest option should not be shown for the guest user
...
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
2015-06-09 15:55:01 -07:00
Casper Bonde
e278a208bc
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 >
2015-06-09 21:42:15 +00:00
Jason Monk
ba0e2c8688
Advanced apps updates (2/2)
...
Change the title of the screen, add a category to break things up
Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
2015-06-09 16:01:28 -04:00
Chris Wren
ca689aeada
annoint new constants
...
Bug: 21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
2015-06-09 14:24:03 -04:00
Tony Mantler
8c39a9c6f2
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
2015-06-09 17:20:25 +00:00
Chris Wren
c7581e8126
instrument display rotation settings
...
Bug: 21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
2015-06-09 12:10:15 -04:00
Chris Wren
182134595b
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
2015-06-09 12:09:44 -04:00
Neil Fuller
b986442747
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
2015-06-09 10:10:56 +01:00
Makoto Onuki
375c3a080e
Show list of permissions instead of just numbers
...
Bug 21615746
Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
2015-06-08 17:48:46 -07:00
Jim Miller
fa47bc0290
Update and cleanup FingerprintManager API to new spec
...
Fixes bug 21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
2015-06-08 17:17:44 -07:00
Tony Mantler
67cd6ab93a
Move ApplicationsState to SettingsLib
...
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
2015-06-08 14:41:02 -07:00
John Spurlock
9a58361076
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893
Settings: Update notification listener user prompt strings.
...
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
2015-06-08 16:50:36 -04:00
Alex Klyubin
abe74683c1
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
2015-06-08 18:11:23 +00:00
John Spurlock
178d46a9b5
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
2015-06-08 16:39:33 +00:00