John Spurlock
385c5acbd6
Merge "Settings: Move downtime to new automation sub-settings page."
2015-04-03 23:53:04 +00:00
Vinit Deshpande
295793928d
Implement 'Available via Passpoint' feature
...
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'
Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
2015-04-03 16:42:28 -07:00
Fyodor Kupolov
4d2c022c13
Merge "Support for nested bundles in setApplicationRestrictions"
2015-04-03 22:24:41 +00:00
Fabrice Di Meglio
1152aee9f6
Merge "Settings - add support for Launch by Default"
2015-04-03 21:40:15 +00:00
Fabrice Di Meglio
8b2ea39cbc
Settings - add support for Launch by Default
...
- implement UX spec
Change-Id: I7ee8962f83983273d809e0ef6fc81b0eb2df15dd
2015-04-03 14:10:01 -07:00
Alex Klyubin
8019aa6b7b
Merge "Make Settings app not use cleartext network traffic."
2015-04-03 20:46:09 +00:00
John Spurlock
d8b3683570
Settings: Move downtime to new automation sub-settings page.
...
Bug: 20064962
Change-Id: I6238439bbd679c143fc986743a65ed64057f2755
2015-04-03 16:27:45 -04:00
John Spurlock
851532f37f
Merge "Settings: Move priority configuration to its own sub-settings page."
2015-04-03 20:07:58 +00:00
John Spurlock
48bbd5d1e4
Settings: Move priority configuration to its own sub-settings page.
...
Bug: 20064962
Change-Id: Idd03e0e5077e13cc08ff9997ab9ad56ddcdb5c50
2015-04-03 15:57:21 -04:00
Fyodor Kupolov
2b2ab5a947
Support for nested bundles in setApplicationRestrictions
...
Replaced RestrictionUtils.restrictionsToBundle with RestrictionsManager.
convertRestrictionsToBundle.
Bug: 19540606
Change-Id: I32b264e04d5d177ea5b4c39a8ace5ee0ce907970
2015-04-03 10:19:24 -07:00
Jason Monk
bca21083a3
Merge "Show current screen lock as summary"
2015-04-03 14:56:53 +00:00
John Spurlock
cefa439559
Merge "Settings: Support new alarms-only zen value."
2015-04-03 03:03:51 +00:00
John Spurlock
b5bbff8c97
Settings: Support new alarms-only zen value.
...
Bug: 19260237
Change-Id: I57941c0e4df8026cdc36076551770a813800edc8
2015-04-02 17:46:44 -04:00
Elliott Hughes
abbe2d4c8a
am 483d7989
: am ff095ab0
: am 189d7e8e
: Merge "Add Europe/Istanbul timezone"
...
* commit '483d7989deac12ea8ad51e7a0bc227289601fb1a':
Add Europe/Istanbul timezone
2015-04-02 18:49:22 +00:00
Alex Klyubin
b009023c76
Make Settings app not use cleartext network traffic.
...
This CL switches the only two places which use cleartext HTTP in this
app to HTTPS. It also declares in the AndroidManifest.xml that this
app does not use cleartext network traffic, thus asking the platform
and tools to block any such traffic from this app on best effort
basis.
NOTE: The only test that uses cleartext HTTP traffic is in VpnTests.
This test makes cleartext HTTP requests to a third-party service which
does not appear to support HTTPS. Thus, this CL temporarily relaxes
the cleartext traffic policy during this test to keep it working. The
correct longer-term fix for this test is to use a service that offers
HTTPS.
Bug: 19215516
Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
2015-04-02 11:30:15 -07:00
Elliott Hughes
483d7989de
am ff095ab0
: am 189d7e8e
: Merge "Add Europe/Istanbul timezone"
...
* commit 'ff095ab05bc6660abd38d9de047ac467c2d070fc':
Add Europe/Istanbul timezone
2015-04-02 17:50:21 +00:00
Elliott Hughes
ff095ab05b
am 189d7e8e
: Merge "Add Europe/Istanbul timezone"
...
* commit '189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
Add Europe/Istanbul timezone
2015-04-02 17:40:44 +00:00
Elliott Hughes
189d7e8e51
Merge "Add Europe/Istanbul timezone"
2015-04-02 17:19:27 +00:00
Samuel Asteberg
7019943855
Add Europe/Istanbul timezone
...
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
2015-04-02 18:18:24 +02:00
Adrian Roos
43a0cbad1b
Merge "Add default emergency app setting"
2015-04-02 15:22:59 +00:00
Adrian Roos
9c86a7adae
Add default emergency app setting
...
Bug: 19841649
Change-Id: I1763ee16e1e10c957261fe663f4c87269adcdef7
2015-04-02 17:21:35 +02:00
Chris Wren
19fb677a58
Merge "provide better instructions for adding settings views."
2015-04-02 14:15:46 +00:00
Chris Wren
20c3093679
provide better instructions for adding settings views.
...
And provide a ready default constant.
Change-Id: I76c9ee50af5d97f9f83be7b0eb862f73fc9bfa7b
2015-04-02 09:38:41 -04:00
Jim Miller
e3107164d5
Merge "Prepare to make Fingerprint API public."
2015-04-02 03:09:57 +00:00
Etan Cohen
96c47d45e7
Merge changes from topic 'mwd-merge-040115'
...
* changes:
Merge commit '279cb4a' into merge
Merge commit '898e486' into merge
Merge commit 'fc75374' into merge
Merge commit '2241607' into merge
Merge commit 'fe47522' into merge
2015-04-02 03:07:52 +00:00
Elliott Hughes
1321412c79
am 14083abb
: am 144c48e7
: am 49fe5084
: Merge "add Recife timezone"
...
* commit '14083abbe9fa5966f3abb718e19132c18861fb76':
add Recife timezone
2015-04-02 02:59:40 +00:00
Elliott Hughes
14083abbe9
am 144c48e7
: am 49fe5084
: Merge "add Recife timezone"
...
* commit '144c48e72736ce9617dfa15331262c13819a17e6':
add Recife timezone
2015-04-02 02:33:26 +00:00
Jim Miller
595982d2c3
Prepare to make Fingerprint API public.
...
- moved fingerprint support files into hardware area
- moved jni into services/core
Bug 16487912
Change-Id: Id111ee89771fc208a9365fd06c57b3dbf85b5356
2015-04-01 19:08:09 -07:00
Elliott Hughes
144c48e727
am 49fe5084
: Merge "add Recife timezone"
...
* commit '49fe5084f73821906572f60bd542ca5042cb794d':
add Recife timezone
2015-04-02 01:13:17 +00:00
Elliott Hughes
49fe5084f7
Merge "add Recife timezone"
2015-04-01 23:55:55 +00:00
Geoff Mendal
2814482924
Merge "Import translations. DO NOT MERGE"
2015-04-01 12:26:33 +00:00
Geoff Mendal
c6c8b291d1
Import translations. DO NOT MERGE
...
Change-Id: I461162761644acfebe4b32ef6e00476acb7e2988
Auto-generated-cl: translation import
2015-04-01 05:37:29 -05:00
Zoltan Szatmary-Ban
c38245f93a
Merge "Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests"
2015-04-01 10:03:50 +00:00
Etan Cohen
9093b6eba2
Merge commit '279cb4a' into merge
2015-03-31 12:40:41 -07:00
Vinit Deshpande
05075242db
Enable UI for EAP-SIM/AKA/AKA'
...
We hide identity field for these; since dynamic
identities are now supported.
Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
2015-03-31 12:36:35 -07:00
Zoltan Szatmary-Ban
de7d498832
Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests
...
This is necessary since the introduction of unified view of managed and
primary apps on that screen.
Bug: 20007125
Change-Id: I20872570563c6248bac6591ba8ab83a730b2e49b
2015-03-31 20:13:25 +01:00
Stuart Scott
bc695c770a
Merge "Move reset network settings into framework."
2015-03-31 18:57:09 +00:00
Etan Cohen
d2416fc652
Merge commit '898e486' into merge
2015-03-31 11:52:28 -07:00
Etan Cohen
93b316d883
Merge commit 'fc75374' into merge
...
Change-Id: I92f58e88c33e44e9c6da813ae6a58c3846b52c29
2015-03-31 11:51:54 -07:00
Etan Cohen
7caa77e40c
Merge commit '2241607' into merge
2015-03-31 11:26:54 -07:00
Etan Cohen
0ef5c998f2
Merge commit 'fe47522' into merge
2015-03-31 11:26:45 -07:00
Jason Monk
25512e82a5
Update string description to be more clear.
...
Bug: 20000920
Change-Id: I393591ecdedb5dc87b4adb9b2e0a684738bcccee
2015-03-31 13:02:18 -04:00
Stuart Scott
73281fbcfe
Move reset network settings into framework.
...
bug: 16161518
Change-Id: I7d62201758e97bf08117183429a7acfa13b74994
2015-03-30 18:00:41 -07:00
Jason Monk
701e55f4c0
Merge "Add permissions screen to advanced apps"
2015-03-30 19:54:24 +00:00
Chris Wren
f22e8c4c2e
log wifi actions from settings
...
To start:
enable
disable
forget
connect
add
Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
2015-03-30 14:33:27 -04:00
Jason Monk
9a64a4215e
Show current screen lock as summary
...
Bug: 19819290
Change-Id: Iefdacd6b86f96e6f3577351e7f92b86217b1b7ad
2015-03-30 11:00:36 -04:00
Jason Monk
2f41aa7955
Add permissions screen to advanced apps
...
Add a screen that shows a list of permissions and how many apps
have been granted them, link to PackageInstaller for control of
the permissions.
Depends on I68cdbe53177f742daf396f4eb53761fd5cda2636
Change-Id: I183848ea89ea41a17eaf663441dc4ef963be99bf
2015-03-30 10:39:29 -04:00
Geoff Mendal
ec5a3373db
Import translations. DO NOT MERGE
...
Change-Id: I27d243fa4d6ef7c0cb916a242d595cf48bf5e11d
Auto-generated-cl: translation import
2015-03-30 08:16:32 -05:00
Stuart Scott
0c2f82ca4e
Merge "Forget Wifi SSID"
2015-03-27 23:21:33 +00:00
Alan Viverette
40b55b1d33
Merge "Fix switch bar theme, clean up text appearances"
2015-03-27 23:16:15 +00:00