OSDN Git Service
Jim Miller [Thu, 9 Apr 2015 05:30:18 +0000 (22:30 -0700)]
Clean up FingerprintManager API and make it public.
Change-Id: Ia5f36857da27da5c3a942350b7f772d237a50bc2
Fabrice Di Meglio [Sat, 11 Apr 2015 02:09:33 +0000 (02:09 +0000)]
Merge "Add user selectable Default Browser feature"
Fabrice Di Meglio [Fri, 10 Apr 2015 02:02:18 +0000 (19:02 -0700)]
Add user selectable Default Browser feature
- add Default Apps section in Apps / Advanced
- follow UX spec
This change depends on a Framework change which adds new APIs in PackageMaager
for setting and getting the default Browser App package name.
See bug #
20144393
Change-Id: I2ff456eeaced9f740f4dd6fb6bccea6de6ea1308
Lifu Tang [Fri, 10 Apr 2015 22:27:31 +0000 (22:27 +0000)]
Merge "Updated the string resource"
John Spurlock [Fri, 10 Apr 2015 12:11:12 +0000 (08:11 -0400)]
Settings: New zen option to allow repeat callers.
Bug:
20064962
Change-Id: Icc65da146503386c057d7f78d6610f83f56d1a92
John Spurlock [Fri, 10 Apr 2015 03:57:23 +0000 (23:57 -0400)]
Settings: Improve automatic rule summary when enabled.
Bug:
20064962
Change-Id: I139679def84f0ba3ea859399499a5657fd85e763
John Spurlock [Thu, 9 Apr 2015 16:50:04 +0000 (12:50 -0400)]
Settings: An update on Downtime.
- Migrate settings to the new zen mode state model.
- Remove downtime settings.
- Add automatic rule management page (add/remove)
- Bind new automatic schedule rules to detail editor.
- Clean up a few found miscapitalized string captions.
- Migrate zen switch to report the shared summary string.
Bug:
20064962
Change-Id: Ia561e7f77c90c962729240b4d51ba1915297f64a
Maurice Lam [Thu, 9 Apr 2015 20:13:35 +0000 (20:13 +0000)]
Merge "Add support for material_blue theme"
Lifu Tang [Thu, 9 Apr 2015 17:26:46 +0000 (17:26 +0000)]
Merge "Worked around back button navigation issue"
Lifu Tang [Thu, 2 Apr 2015 19:05:46 +0000 (12:05 -0700)]
Worked around back button navigation issue
Calling startWithFragmentAsUser() without specifying FLAG_ACTIVITY_NEW_TASK to
the intent starting the fragment could cause a native stack corruption. See
b/
17523189. However, adding that flag and start the preference panel with the
same UserHandler will make it impossible to use back button to return to the
previous screen. See b/
20042570.
We work around this issue by adding FLAG_ACTIVITY_NEW_TASK to the intent, while
doing another check here to call startPreferencePanel() instead of
startWithFragmentAsUser() when we're calling it as the same user.
Bug:
20042570
Change-Id: I26b269414f410912b77aaa553a3fccebfa148659
John Spurlock [Thu, 9 Apr 2015 16:58:54 +0000 (16:58 +0000)]
Merge "Zen: Move zen mode preference to switch bar."
Ryo Hashimoto [Thu, 9 Apr 2015 10:26:52 +0000 (10:26 +0000)]
Merge "Enable BugreportStorageProvider when bug report is enabled"
Maurice Lam [Thu, 9 Apr 2015 04:13:42 +0000 (21:13 -0700)]
Add support for material_blue theme
Add support for material_blue theme, which setup wizard is going to
use for M. This changes SetupWizardUtils.getTheme to always return
either SetupWizardTheme or SetupWizardTheme_Light, and added the
theme value "material" blue.
Bug:
19729981
Change-Id: I63678312af4942be358b92a58b1c84f89aaaa6c1
Lifu Tang [Thu, 9 Apr 2015 01:23:19 +0000 (18:23 -0700)]
Updated the string resource
- Removed references to "Google services" (b/
20098473)
- Made the link markers untranslatable (b/
20097593)
- Updated all strings to final version (b/
20128009)
Bug:
20097593
Bug:
20098473
Bug:
20128009
Change-Id: I51ecc6cd8004e6a854053abae8654bc877dcf2a6
Adrian Roos [Wed, 8 Apr 2015 15:24:29 +0000 (15:24 +0000)]
Merge "Allow none lockscreen with multiple users"
Adrian Roos [Wed, 8 Apr 2015 14:50:20 +0000 (14:50 +0000)]
Merge "Hide emergency app settings on non-voice deivces"
Adrian Roos [Wed, 8 Apr 2015 12:50:03 +0000 (14:50 +0200)]
Hide emergency app settings on non-voice deivces
Bug:
19841649
Change-Id: I30ba582f503514656c99f3aea2801a68dfd1a5fa
Geoff Mendal [Wed, 8 Apr 2015 13:23:55 +0000 (08:23 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ie968e96e3a2420226abd618b77db0f5a03d2ae5e
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 8 Apr 2015 00:32:06 +0000 (00:32 +0000)]
Merge "Settings - add support for Launch by Default - part 2"
Fabrice Di Meglio [Fri, 3 Apr 2015 22:16:13 +0000 (15:16 -0700)]
Settings - add support for Launch by Default - part 2
UX fixes
- make the ManageApplications list to be able to handle some disable items
- add domain list for App that are not verified
Change-Id: Ib37c6f3f3dd1d1cdc17db434967f583cc89e068c
Adam Lesinski [Tue, 7 Apr 2015 23:51:14 +0000 (23:51 +0000)]
Merge "Update name of field used from BatterySipper"
Jason Monk [Tue, 7 Apr 2015 19:21:40 +0000 (19:21 +0000)]
Merge "Add runtime permission summary for M apps"
Jason Monk [Fri, 3 Apr 2015 17:43:27 +0000 (13:43 -0400)]
Add runtime permission summary for M apps
Bug:
20104004
Change-Id: I88b7db34e52444a0c23a8f4ccb76e52bbb83f118
Adam Lesinski [Tue, 7 Apr 2015 01:21:43 +0000 (18:21 -0700)]
Update name of field used from BatterySipper
Change-Id: Ie7ec921d646b50826d4dfe942bc13ddfc4cd9190
Adrian Roos [Tue, 7 Apr 2015 14:55:29 +0000 (16:55 +0200)]
Allow none lockscreen with multiple users
Bug:
19962043
Change-Id: Ic7dcbd371d700bf8796f50469a7ac7d529ec491d
Adrian Roos [Tue, 7 Apr 2015 14:19:50 +0000 (14:19 +0000)]
Merge "Fix crash on rotation while ICE dialog is open"
Adrian Roos [Tue, 7 Apr 2015 13:18:09 +0000 (15:18 +0200)]
Fix crash on rotation while ICE dialog is open
Bug:
20096049
Change-Id: I90c5d98b26cc55d7178e6c154ff1788ccb4c3974
Bart Sears [Tue, 7 Apr 2015 06:19:47 +0000 (06:19 +0000)]
Merge "Revert "Update name of field used from BatterySipper""
Bart Sears [Tue, 7 Apr 2015 06:15:25 +0000 (06:15 +0000)]
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
a74ddc29b831d788ecedffef3233ae7c8d3241a1.
Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88
Adam Lesinski [Tue, 7 Apr 2015 01:52:57 +0000 (01:52 +0000)]
Merge "Update name of field used from BatterySipper"
Adam Lesinski [Tue, 7 Apr 2015 01:21:43 +0000 (18:21 -0700)]
Update name of field used from BatterySipper
This relies on change Ia3d97e0a1c3352127185c18626d8ba8221c9ab40
Change-Id: Ibfb31da3938bf2ff4cf20444e680addabcca9eb3
Lifu Tang [Mon, 6 Apr 2015 22:39:40 +0000 (22:39 +0000)]
Merge "Updated system settings to control BLE scanning"
Lifu Tang [Mon, 6 Apr 2015 22:39:28 +0000 (22:39 +0000)]
Merge "Added links to scanning settings"
Dianne Hackborn [Mon, 6 Apr 2015 20:21:54 +0000 (20:21 +0000)]
Merge "Update with new assist app ops."
Lifu Tang [Mon, 6 Apr 2015 18:02:51 +0000 (11:02 -0700)]
Updated system settings to control BLE scanning
Bug:
19966182
Change-Id: Ic3f51957629d785017dd92f7a28f78f20e739559
Lifu Tang [Fri, 27 Mar 2015 00:56:19 +0000 (17:56 -0700)]
Added links to scanning settings
Bug:
19918721
Change-Id: Ifb1508807d34b675e9ea1522f86a9310ed6b663f
Maurice Lam [Wed, 1 Apr 2015 21:20:16 +0000 (14:20 -0700)]
[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
Geoff Mendal [Mon, 6 Apr 2015 13:05:34 +0000 (08:05 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ibf88a86ea2fa1bfd7f73728de8f712c06ec3b91e
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 5 Apr 2015 00:48:18 +0000 (17:48 -0700)]
Update with new assist app ops.
Change-Id: I796845dd1cb3ccfe951e0cbdb7cab55ec476f128
John Spurlock [Sat, 4 Apr 2015 19:43:37 +0000 (15:43 -0400)]
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
Geoff Mendal [Sat, 4 Apr 2015 05:54:58 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic979dd992c6bce9178a743a924cb5c210757408b
Auto-generated-cl: translation import
John Spurlock [Fri, 3 Apr 2015 23:53:03 +0000 (23:53 +0000)]
Merge "Settings: Move downtime to new automation sub-settings page."
Fyodor Kupolov [Fri, 3 Apr 2015 22:24:40 +0000 (22:24 +0000)]
Merge "Support for nested bundles in setApplicationRestrictions"
Fabrice Di Meglio [Fri, 3 Apr 2015 21:40:03 +0000 (21:40 +0000)]
Merge "Settings - add support for Launch by Default"
Fabrice Di Meglio [Sat, 24 Jan 2015 03:03:22 +0000 (19:03 -0800)]
Settings - add support for Launch by Default
- implement UX spec
Change-Id: I7ee8962f83983273d809e0ef6fc81b0eb2df15dd
Alex Klyubin [Fri, 3 Apr 2015 20:46:08 +0000 (20:46 +0000)]
Merge "Make Settings app not use cleartext network traffic."
John Spurlock [Fri, 3 Apr 2015 19:11:33 +0000 (15:11 -0400)]
Settings: Move downtime to new automation sub-settings page.
Bug:
20064962
Change-Id: I6238439bbd679c143fc986743a65ed64057f2755
John Spurlock [Fri, 3 Apr 2015 20:07:54 +0000 (20:07 +0000)]
Merge "Settings: Move priority configuration to its own sub-settings page."
John Spurlock [Fri, 3 Apr 2015 17:51:03 +0000 (13:51 -0400)]
Settings: Move priority configuration to its own sub-settings page.
Bug:
20064962
Change-Id: Idd03e0e5077e13cc08ff9997ab9ad56ddcdb5c50
Fyodor Kupolov [Tue, 24 Mar 2015 01:57:24 +0000 (18:57 -0700)]
Support for nested bundles in setApplicationRestrictions
Replaced RestrictionUtils.restrictionsToBundle with RestrictionsManager.
convertRestrictionsToBundle.
Bug:
19540606
Change-Id: I32b264e04d5d177ea5b4c39a8ace5ee0ce907970
Jason Monk [Fri, 3 Apr 2015 14:56:52 +0000 (14:56 +0000)]
Merge "Show current screen lock as summary"
John Spurlock [Fri, 3 Apr 2015 03:03:45 +0000 (03:03 +0000)]
Merge "Settings: Support new alarms-only zen value."
John Spurlock [Thu, 2 Apr 2015 21:46:44 +0000 (17:46 -0400)]
Settings: Support new alarms-only zen value.
Bug:
19260237
Change-Id: I57941c0e4df8026cdc36076551770a813800edc8
Elliott Hughes [Thu, 2 Apr 2015 18:49:22 +0000 (18:49 +0000)]
am
483d7989: am
ff095ab0: am
189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '
483d7989deac12ea8ad51e7a0bc227289601fb1a':
Add Europe/Istanbul timezone
Alex Klyubin [Thu, 2 Apr 2015 18:08:51 +0000 (11:08 -0700)]
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
Elliott Hughes [Thu, 2 Apr 2015 17:50:21 +0000 (17:50 +0000)]
am
ff095ab0: am
189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '
ff095ab05bc6660abd38d9de047ac467c2d070fc':
Add Europe/Istanbul timezone
Elliott Hughes [Thu, 2 Apr 2015 17:40:44 +0000 (17:40 +0000)]
am
189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '
189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
Add Europe/Istanbul timezone
Elliott Hughes [Thu, 2 Apr 2015 17:19:27 +0000 (17:19 +0000)]
Merge "Add Europe/Istanbul timezone"
Samuel Asteberg [Mon, 22 Sep 2014 10:24:40 +0000 (12:24 +0200)]
Add Europe/Istanbul timezone
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
Adrian Roos [Thu, 2 Apr 2015 15:22:58 +0000 (15:22 +0000)]
Merge "Add default emergency app setting"
Adrian Roos [Thu, 2 Apr 2015 13:29:56 +0000 (15:29 +0200)]
Add default emergency app setting
Bug:
19841649
Change-Id: I1763ee16e1e10c957261fe663f4c87269adcdef7
Chris Wren [Thu, 2 Apr 2015 14:15:45 +0000 (14:15 +0000)]
Merge "provide better instructions for adding settings views."
Chris Wren [Wed, 1 Apr 2015 23:00:40 +0000 (19:00 -0400)]
provide better instructions for adding settings views.
And provide a ready default constant.
Change-Id: I76c9ee50af5d97f9f83be7b0eb862f73fc9bfa7b
Jim Miller [Thu, 2 Apr 2015 03:09:56 +0000 (03:09 +0000)]
Merge "Prepare to make Fingerprint API public."
Etan Cohen [Thu, 2 Apr 2015 03:07:28 +0000 (03:07 +0000)]
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
Elliott Hughes [Thu, 2 Apr 2015 02:59:40 +0000 (02:59 +0000)]
am
14083abb: am
144c48e7: am
49fe5084: Merge "add Recife timezone"
* commit '
14083abbe9fa5966f3abb718e19132c18861fb76':
add Recife timezone
Elliott Hughes [Thu, 2 Apr 2015 02:33:26 +0000 (02:33 +0000)]
am
144c48e7: am
49fe5084: Merge "add Recife timezone"
* commit '
144c48e72736ce9617dfa15331262c13819a17e6':
add Recife timezone
Jim Miller [Wed, 1 Apr 2015 23:49:33 +0000 (16:49 -0700)]
Prepare to make Fingerprint API public.
- moved fingerprint support files into hardware area
- moved jni into services/core
Bug
16487912
Change-Id: Id111ee89771fc208a9365fd06c57b3dbf85b5356
Elliott Hughes [Thu, 2 Apr 2015 01:13:17 +0000 (01:13 +0000)]
am
49fe5084: Merge "add Recife timezone"
* commit '
49fe5084f73821906572f60bd542ca5042cb794d':
add Recife timezone
Elliott Hughes [Wed, 1 Apr 2015 23:55:55 +0000 (23:55 +0000)]
Merge "add Recife timezone"
Geoff Mendal [Wed, 1 Apr 2015 12:26:32 +0000 (12:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 1 Apr 2015 10:37:29 +0000 (05:37 -0500)]
Import translations. DO NOT MERGE
Change-Id: I461162761644acfebe4b32ef6e00476acb7e2988
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Wed, 1 Apr 2015 10:03:48 +0000 (10:03 +0000)]
Merge "Add PRIMARY_PROFILE_CONTROLLED to Settings > App activity manifests"
Etan Cohen [Tue, 31 Mar 2015 19:40:41 +0000 (12:40 -0700)]
Merge commit '
279cb4a' into merge
Zoltan Szatmary-Ban [Tue, 31 Mar 2015 18:49:18 +0000 (19:49 +0100)]
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
Stuart Scott [Tue, 31 Mar 2015 18:57:09 +0000 (18:57 +0000)]
Merge "Move reset network settings into framework."
Etan Cohen [Tue, 31 Mar 2015 18:52:28 +0000 (11:52 -0700)]
Merge commit '
898e486' into merge
Etan Cohen [Tue, 31 Mar 2015 18:51:54 +0000 (11:51 -0700)]
Merge commit '
fc75374' into merge
Change-Id: I92f58e88c33e44e9c6da813ae6a58c3846b52c29
Etan Cohen [Tue, 31 Mar 2015 18:26:54 +0000 (11:26 -0700)]
Merge commit '
2241607' into merge
Etan Cohen [Tue, 31 Mar 2015 18:26:45 +0000 (11:26 -0700)]
Merge commit '
fe47522' into merge
Jason Monk [Tue, 31 Mar 2015 17:02:18 +0000 (13:02 -0400)]
Update string description to be more clear.
Bug:
20000920
Change-Id: I393591ecdedb5dc87b4adb9b2e0a684738bcccee
Stuart Scott [Mon, 30 Mar 2015 20:16:29 +0000 (13:16 -0700)]
Move reset network settings into framework.
bug:
16161518
Change-Id: I7d62201758e97bf08117183429a7acfa13b74994
Jason Monk [Mon, 30 Mar 2015 19:54:23 +0000 (19:54 +0000)]
Merge "Add permissions screen to advanced apps"
Chris Wren [Thu, 26 Mar 2015 17:34:02 +0000 (13:34 -0400)]
log wifi actions from settings
To start:
enable
disable
forget
connect
add
Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
Jason Monk [Mon, 30 Mar 2015 15:00:36 +0000 (11:00 -0400)]
Show current screen lock as summary
Bug:
19819290
Change-Id: Iefdacd6b86f96e6f3577351e7f92b86217b1b7ad
Jason Monk [Thu, 26 Mar 2015 12:30:50 +0000 (08:30 -0400)]
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
Geoff Mendal [Mon, 30 Mar 2015 13:16:32 +0000 (08:16 -0500)]
Import translations. DO NOT MERGE
Change-Id: I27d243fa4d6ef7c0cb916a242d595cf48bf5e11d
Auto-generated-cl: translation import
Stuart Scott [Fri, 27 Mar 2015 23:21:32 +0000 (23:21 +0000)]
Merge "Forget Wifi SSID"
Alan Viverette [Fri, 27 Mar 2015 23:16:14 +0000 (23:16 +0000)]
Merge "Fix switch bar theme, clean up text appearances"
Geoff Mendal [Fri, 27 Mar 2015 22:14:21 +0000 (15:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic235d2ba6215cbcf6850d8e7fab2a405311b7d32
Auto-generated-cl: translation import
Lifu Tang [Fri, 27 Mar 2015 19:51:46 +0000 (19:51 +0000)]
Merge "Made scanning settings searchable"
Lifu Tang [Fri, 27 Mar 2015 00:56:52 +0000 (17:56 -0700)]
Made scanning settings searchable
Bug:
19965598
Change-Id: I2868bc2185d56861f5a0927bb8d49d978e99f33b
Chris Wren [Fri, 20 Mar 2015 14:29:14 +0000 (10:29 -0400)]
log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
Alan Viverette [Fri, 27 Mar 2015 17:23:45 +0000 (10:23 -0700)]
Fix switch bar theme, clean up text appearances
Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
Jason Sams [Fri, 27 Mar 2015 02:01:05 +0000 (02:01 +0000)]
am
57f132d0: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
* commit '
57f132d0862369899e937664c45f35e220db4cf7':
Stuart Scott [Fri, 27 Mar 2015 02:01:02 +0000 (02:01 +0000)]
Jason Sams [Fri, 27 Mar 2015 01:24:58 +0000 (01:24 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Stuart Scott [Fri, 27 Mar 2015 01:10:27 +0000 (01:10 +0000)]
Stuart Scott [Fri, 27 Mar 2015 00:50:43 +0000 (00:50 +0000)]
Stuart Scott [Fri, 27 Mar 2015 00:34:46 +0000 (00:34 +0000)]
am
53eec9fa: Fix sim notifications.
* commit '
53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.