Commit Graph

8655 Commits

Author SHA1 Message Date
Bart Sears
a79c449515 Merge "Revert "Update name of field used from BatterySipper"" 2015-04-07 06:19:49 +00:00
Bart Sears
86c99e28e9 Revert "Update name of field used from BatterySipper"
Companion CL needed to be reverted as it was breaking the build, so
reverting this CL as well until Adam has a chance to investigate.

This reverts commit a74ddc29b8.

Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88
2015-04-07 06:15:25 +00:00
Adam Lesinski
a75c2caff7 Merge "Update name of field used from BatterySipper" 2015-04-07 01:53:03 +00:00
Adam Lesinski
a74ddc29b8 Update name of field used from BatterySipper
This relies on change Ia3d97e0a1c3352127185c18626d8ba8221c9ab40

Change-Id: Ibfb31da3938bf2ff4cf20444e680addabcca9eb3
2015-04-06 18:21:43 -07:00
Lifu Tang
d858ed9784 Merge "Updated system settings to control BLE scanning" 2015-04-06 22:39:40 +00:00
Lifu Tang
c36e1c4e0a Merge "Added links to scanning settings" 2015-04-06 22:39:28 +00:00
Dianne Hackborn
bec3e01143 Merge "Update with new assist app ops." 2015-04-06 20:21:55 +00:00
Lifu Tang
0ac63cdca2 Updated system settings to control BLE scanning
Bug: 19966182
Change-Id: Ic3f51957629d785017dd92f7a28f78f20e739559
2015-04-06 11:02:51 -07:00
Lifu Tang
be794c30ca Added links to scanning settings
Bug: 19918721
Change-Id: Ifb1508807d34b675e9ea1522f86a9310ed6b663f
2015-04-06 11:00:04 -07:00
Maurice Lam
4e0fc628f0 [Fingerprint] Add fingerprint text in setup flow
When running in Setup Wizard, the screen to choose screen lock will
have an additional footer, telling the user that they can configure
fingerprint in Settings after completing the setup flow.

Bug: 19690335
Change-Id: Ie6268fb8738e6bbac8751d12b05c82092fe6193b
2015-04-06 10:09:59 -07:00
Dianne Hackborn
7781ef6870 Update with new assist app ops.
Change-Id: I796845dd1cb3ccfe951e0cbdb7cab55ec476f128
2015-04-04 17:48:18 -07:00
John Spurlock
b47b2c3f6a Zen: Move zen mode preference to switch bar.
- Add summary line support to SwitchBar.
 - Remove obsolete strings.
 - Wire up switchbar to zen mode w/ dialog prompt.
 - Remove obsolete callback pref helper.

Bug: 20064962
Change-Id: Ifede00b5d43d441ccd94db96bd2796bc57d1a990
2015-04-04 15:47:43 -04:00
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
b5bbff8c97 Settings: Support new alarms-only zen value.
Bug: 19260237
Change-Id: I57941c0e4df8026cdc36076551770a813800edc8
2015-04-02 17:46:44 -04: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
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
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
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
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
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
Stuart Scott
0c2f82ca4e Merge "Forget Wifi SSID" 2015-03-27 23:21:33 +00:00
Lifu Tang
a369820002 Merge "Made scanning settings searchable" 2015-03-27 19:51:46 +00:00
Lifu Tang
ff6d4894e8 Made scanning settings searchable
Bug: 19965598

Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
2015-03-27 12:39:40 -07:00
Chris Wren
8a963babe2 log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
2015-03-27 13:39:07 -04:00
Stuart Scott
e35a5bab32 Forget Wifi SSID
Change-Id: I6d4bf3117d92567f89a8eedf41a430ee5342b6c6
2015-03-26 11:47:36 -07:00
Jason Monk
390910b333 Merge "Fix managed profile bugs in manage apps list" 2015-03-26 12:40:44 +00:00
Jason Monk
1f4f30cd06 Fix managed profile bugs in manage apps list
- Uses the same package manager flags as secondary users for managed
   profiles, so that owner apps don't show up.

 - Fixes bug in getting AppEntries that caused app info for profile
   apps to get the owner one instead (which was unbadged and very
   broken).

Bug: 19817357
Change-Id: I659ab1081c68a231330f5b16486abc5a0a5b2029
2015-03-26 08:35:02 -04:00
Vinit Deshpande
279cb4a590 Merge "Fix settings UI for passpoint networks" into m-wireless-dev 2015-03-25 22:42:00 +00:00
Vinit Deshpande
15b4c84c31 Fix settings UI for passpoint networks
This change includes showing the friendly name in saved
networks list and 'Connected via provider' addition for
passpoint connections.

Change-Id: I613770e0468f888c280e82a89b8a012a841d5bbd
2015-03-25 15:41:03 -07:00
Stuart Scott
ce3bf6bacb Merge "Dont access PhoneFactory, as it could have been inited in another JVM." 2015-03-25 22:27:52 +00:00