Commit Graph

20472 Commits

Author SHA1 Message Date
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
Sanket Padawe
5f7560f856 Fix button layout issue for sv-SE locale.
Bug: 21479378
Change-Id: I4858958a26b183461490c052fece66941314edcc
2015-06-11 10:34:38 -07:00
Jeff Sharkey
0f6b243d4b Merge "Slow dialog string has no limit." into mnc-dev 2015-06-11 16:20:23 +00:00
Jeff Sharkey
9b0d09914b Slow dialog string has no limit.
Bug: 21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
2015-06-11 09:18:00 -07: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
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Sanket Padawe
1d220f6242 Merge "Fix SimPreference dialog from closing on orientation change." into mnc-dev 2015-06-11 01:41:21 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
2015-06-10 18:08:16 -07: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
Jeff Sharkey
3803d91abb New strings!
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
2015-06-10 16:47:52 -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
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