Commit Graph

20703 Commits

Author SHA1 Message Date
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
Jason Monk
f8d131e181 Add string for profile owner usage access warning
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +00: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
Geoff Mendal
3e0514d746 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 15:25:02 +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
Geoff Mendal
f61a092711 Import translations. DO NOT MERGE
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
2015-06-10 08:04:57 -07:00
Lorenzo Colitti
c6d997271a 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
2015-06-10 23:38:19 +09: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
caec03f9e5 Remove periods from ignore optimizations summaries
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2 Merge "Advanced apps updates (2/2)" into mnc-dev 2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8 Merge "Add sd card string, just in case" into mnc-dev 2015-06-10 12:59:30 +00:00
Neil Fuller
c28330ec3e Merge "Modifications for changes to SettingsLib" into mnc-dev 2015-06-10 12:23:49 +00:00
The Android Automerger
3f94f562c1 merge in mnc-release history after reset to mnc-dev 2015-06-10 01:04:19 -07:00
Jeff Brown
b18130c0df Add simulated 4K display modes.
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
2015-06-09 19:52:24 -07: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
Paul Lawrence
2114e386a4 Merge "Move CryptKeeper to own process" into mnc-dev 2015-06-09 21:00:21 +00:00
Jason Monk
51f7c067aa Merge "Top level: "Storage" -> "Storage & USB"" into mnc-dev 2015-06-09 20:30:35 +00:00
Jason Monk
4da8e84432 Add sd card string, just in case
Bug: 21471429
Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
2015-06-09 16:26:07 -04: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
Jason Monk
4ab327b05f Merge "Accounts -> Account sync" into mnc-dev 2015-06-09 19:50:12 +00:00
Jason Monk
fed12068e0 Merge "Bring back gear icon for advanced app settings" into mnc-dev 2015-06-09 19:49:22 +00:00
Jason Monk
32ff4d9bc9 Bring back gear icon for advanced app settings
Bug: 21372377
Change-Id: Id7192d4f3f019d099b530a7acc6556054e92dfba
2015-06-09 15:45:17 -04:00
Jason Monk
2b6c3c0f72 Top level: "Storage" -> "Storage & USB"
Bug: 21324048
Change-Id: I42853135e3a119b84b86a96968053d64313a4b92
2015-06-09 15:32:14 -04:00
Jason Monk
86333477b7 Add strings that will be used for new ignore opt ux
Bug: 21375688
Change-Id: Ifb01e2a1fe9a1d4ae55acafa046080740e8bc5dc
2015-06-09 15:24:05 -04:00
Jason Monk
43db745ea0 Accounts -> Account sync
Bug: 21726868
Change-Id: I806730a338f4320398766dfd32867656bced77fe
2015-06-09 14:46:57 -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
Sudheer Shanka
b259b38457 Merge "Update some strings." into mnc-dev 2015-06-09 16:24:14 +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
Sudheer Shanka
566678a013 Update some strings.
Bug: 20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
2015-06-09 14:29:26 +01: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
The Android Automerger
a6511e7541 merge in mnc-release history after reset to mnc-dev 2015-06-09 01:04:53 -07: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