OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoFix crash in settings when no fingerprint is available
Jorim Jaggi [Tue, 14 Apr 2015 18:14:19 +0000 (11:14 -0700)]
Fix crash in settings when no fingerprint is available

Bug: 20207600
Change-Id: If2a6251b085f22fffabc43aee197550328e6bfef

9 years agoMerge "Update confirm device credentials to spec, add fingerprint"
Jorim Jaggi [Mon, 13 Apr 2015 22:01:21 +0000 (22:01 +0000)]
Merge "Update confirm device credentials to spec, add fingerprint"

9 years agoUpdate confirm device credentials to spec, add fingerprint
Jorim Jaggi [Tue, 7 Apr 2015 00:47:18 +0000 (17:47 -0700)]
Update confirm device credentials to spec, add fingerprint

- New strings in the screen.
- New layout/style.
- Clean up internal API's around it.
- Add fingerprint support if launched from externally
- Separate theme if launched from externally
- If launched from above Keyguard, use SHOW_WHEN_LOCKED flag

Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f

9 years agoCorrect strings for reset network settings.
Stuart Scott [Mon, 13 Apr 2015 19:46:19 +0000 (12:46 -0700)]
Correct strings for reset network settings.

bug:16161518
Change-Id: I32242d64cae27b933186a7d0573b6d863ef3efaf

9 years agoFix loading screens for manage and running apps
Jason Monk [Tue, 31 Mar 2015 16:59:33 +0000 (12:59 -0400)]
Fix loading screens for manage and running apps

Also add loading screen to manage permissions as this can take a
long time to load in some circumstances. Build loading screens into
Utils and SettingsPreferenceFragment so that it can be easily used
other places in the future.

Change-Id: I7febd06695487e02ced793a9fd418051b5f0eab8

9 years agoMerge "Settings: Mark string reference as untranslatable."
John Spurlock [Mon, 13 Apr 2015 17:04:03 +0000 (17:04 +0000)]
Merge "Settings: Mark string reference as untranslatable."

9 years agoSettings: Mark string reference as untranslatable.
John Spurlock [Mon, 13 Apr 2015 17:01:55 +0000 (13:01 -0400)]
Settings: Mark string reference as untranslatable.

Bug: 20175103
Change-Id: I8bee006ae20a972b345178332ab240571851b8bf

9 years agoMerge "Wrap tintable icons with correctly tinted drawable XML"
Alan Viverette [Mon, 13 Apr 2015 16:31:45 +0000 (16:31 +0000)]
Merge "Wrap tintable icons with correctly tinted drawable XML"

9 years agoMerge "CleanSpec!"
Jeff Sharkey [Mon, 13 Apr 2015 16:22:23 +0000 (16:22 +0000)]
Merge "CleanSpec!"

9 years agoCleanSpec!
Jeff Sharkey [Mon, 13 Apr 2015 16:21:39 +0000 (09:21 -0700)]
CleanSpec!

Change-Id: I2e8a01fa14aeea4b8f9af83deab31b5d136d4120

9 years agoMerge "Settings: Remove more obsolete strings."
John Spurlock [Mon, 13 Apr 2015 15:36:57 +0000 (15:36 +0000)]
Merge "Settings: Remove more obsolete strings."

9 years agoSettings: Remove more obsolete strings.
John Spurlock [Mon, 13 Apr 2015 15:35:11 +0000 (11:35 -0400)]
Settings: Remove more obsolete strings.

This settings screen is not shown, and is removed in a subsequent change.

Change-Id: If9a19429160ab8b12d8e57002b80282a7531fd82

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 13 Apr 2015 14:50:47 +0000 (14:50 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit ff09fe57b2c12df3cf43fcea8f2c4462bcab363c.

Change-Id: I38c0bddd69395cdda2e7ea4e3e08eb9395d74db8

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Apr 2015 14:29:28 +0000 (07:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I73d89b1cf5e685aeff2137d24ebe00fca5d70595
Auto-generated-cl: translation import

9 years agoMerge "Settings: Remove reference to removed string from manifest."
John Spurlock [Mon, 13 Apr 2015 14:06:15 +0000 (14:06 +0000)]
Merge "Settings: Remove reference to removed string from manifest."

9 years agoSettings: Remove reference to removed string from manifest.
John Spurlock [Mon, 13 Apr 2015 14:02:10 +0000 (10:02 -0400)]
Settings: Remove reference to removed string from manifest.

Bug: 20064962
Change-Id: Ie63d902cc6e327eb3f7df00a0d1c16e23f93634e

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 13 Apr 2015 13:44:56 +0000 (13:44 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 918bd23627a98bb7524bf5b68aa59b47f8624aee.

Change-Id: Ided42e8810b348228aacf16434bfa00419682fb8

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Apr 2015 13:10:40 +0000 (08:10 -0500)]
Import translations. DO NOT MERGE

Change-Id: I2447305da552484bc865922e4a5f5993e8733c14
Auto-generated-cl: translation import

9 years agoCheckpoint of new storage UI.
Jeff Sharkey [Sun, 12 Apr 2015 04:27:33 +0000 (21:27 -0700)]
Checkpoint of new storage UI.

Top-level storage UI now shows list of all devices, both internal
and adopted/private volumes, and public/shared volumes.

When viewing a private volume, show traditional clustering of data
types, including summary of other users.  For adopted volumes, any
actions are tucked away in a menu, since they're not primary.  Misc
files browsing is now provided by DocumentsUI.

Teach StorageMeasurement about new private volumes, including
handling emulated volumes stacked above them.  When measuring, only
consider apps actually hosted on the current volume UUID.

When viewing a public volume, we default to launching into file
management mode, and offer a simple eject button at the top-level
view.  File management mode is offered by new DocumentsUI browse
intent, and a Settings link there redirects back to us for actual
operations like ejecting/formatting.  When unmounted, we launch
into our action view.

Actions like ejecting/formatting just show simple toasts for now.

Bug: 19993667
Change-Id: Ie990ef3c01fb3717aaf8c79bfc53aac7edefdcf7

9 years agoMerge "Merge commit 'a14fc12' into merge_work"
Prerepa Viswanadham [Sun, 12 Apr 2015 21:59:37 +0000 (21:59 +0000)]
Merge "Merge commit 'a14fc12' into merge_work"

9 years agoMerge changes Ia5f7028f,I1d7dc74b
Prerepa Viswanadham [Sun, 12 Apr 2015 21:58:54 +0000 (21:58 +0000)]
Merge changes Ia5f7028f,I1d7dc74b

* changes:
  Merge commit '2957939' into merge_work
  Merge commit '0507524' into merge_work

9 years agoClean up FingerprintManager API and make it public.
Jim Miller [Thu, 9 Apr 2015 05:30:18 +0000 (22:30 -0700)]
Clean up FingerprintManager API and make it public.

Change-Id: Ia5f36857da27da5c3a942350b7f772d237a50bc2

9 years agoMerge "Add user selectable Default Browser feature"
Fabrice Di Meglio [Sat, 11 Apr 2015 02:09:33 +0000 (02:09 +0000)]
Merge "Add user selectable Default Browser feature"

9 years agoAdd 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

9 years agoWrap tintable icons with correctly tinted drawable XML
Alan Viverette [Fri, 10 Apr 2015 22:46:18 +0000 (15:46 -0700)]
Wrap tintable icons with correctly tinted drawable XML

Replaces pre-tinted icons with flat black, grayscale versions suitable
for use as alpha masks.

Bug: 20143927
Change-Id: I0bca5dee6fcb273902db174c818cc529a5c13f91

9 years agoMerge commit 'a14fc12' into merge_work
Prerepa Viswanadham [Fri, 10 Apr 2015 22:45:48 +0000 (15:45 -0700)]
Merge commit 'a14fc12' into merge_work

9 years agoMerge commit '2957939' into merge_work
Prerepa Viswanadham [Fri, 10 Apr 2015 22:45:36 +0000 (15:45 -0700)]
Merge commit '2957939' into merge_work

9 years agoMerge commit '0507524' into merge_work
Prerepa Viswanadham [Fri, 10 Apr 2015 22:43:14 +0000 (15:43 -0700)]
Merge commit '0507524' into merge_work

9 years agoMerge "Updated the string resource"
Lifu Tang [Fri, 10 Apr 2015 22:27:31 +0000 (22:27 +0000)]
Merge "Updated the string resource"

9 years agoSettings: New zen option to allow repeat callers.
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

9 years agoSettings: Improve automatic rule summary when enabled.
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

9 years agoSettings: An update on Downtime.
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

9 years agoMerge "Add support for material_blue theme"
Maurice Lam [Thu, 9 Apr 2015 20:13:35 +0000 (20:13 +0000)]
Merge "Add support for material_blue theme"

9 years agoMerge "Worked around back button navigation issue"
Lifu Tang [Thu, 9 Apr 2015 17:26:46 +0000 (17:26 +0000)]
Merge "Worked around back button navigation issue"

9 years agoWorked 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

9 years agoMerge "Zen: Move zen mode preference to switch bar."
John Spurlock [Thu, 9 Apr 2015 16:58:54 +0000 (16:58 +0000)]
Merge "Zen: Move zen mode preference to switch bar."

9 years agoMerge "Enable BugreportStorageProvider when bug report is enabled"
Ryo Hashimoto [Thu, 9 Apr 2015 10:26:52 +0000 (10:26 +0000)]
Merge "Enable BugreportStorageProvider when bug report is enabled"

9 years agoAdd support for material_blue theme
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

9 years agoUpdated the string resource
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

9 years agoMerge "Allow none lockscreen with multiple users"
Adrian Roos [Wed, 8 Apr 2015 15:24:29 +0000 (15:24 +0000)]
Merge "Allow none lockscreen with multiple users"

9 years agoMerge "Hide emergency app settings on non-voice deivces"
Adrian Roos [Wed, 8 Apr 2015 14:50:20 +0000 (14:50 +0000)]
Merge "Hide emergency app settings on non-voice deivces"

9 years agoHide 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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Settings - add support for Launch by Default - part 2"
Fabrice Di Meglio [Wed, 8 Apr 2015 00:32:06 +0000 (00:32 +0000)]
Merge "Settings - add support for Launch by Default - part 2"

9 years agoSettings - 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

9 years agoMerge "Update name of field used from BatterySipper"
Adam Lesinski [Tue, 7 Apr 2015 23:51:14 +0000 (23:51 +0000)]
Merge "Update name of field used from BatterySipper"

9 years agoMerge "Add runtime permission summary for M apps"
Jason Monk [Tue, 7 Apr 2015 19:21:40 +0000 (19:21 +0000)]
Merge "Add runtime permission summary for M apps"

9 years agoAdd 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

9 years agoUpdate 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

Change-Id: Ie7ec921d646b50826d4dfe942bc13ddfc4cd9190

9 years agoRemove "Wi-Fi only" option from Wi-Fi Calling settings
Pavel Zhamaitsiak [Tue, 7 Apr 2015 17:01:17 +0000 (17:01 +0000)]
Remove "Wi-Fi only" option from Wi-Fi Calling settings
automerge: a72c266

* commit 'a72c266d5de51188666435ca1fc1e5c2754ef033':
  Remove "Wi-Fi only" option from Wi-Fi Calling settings

9 years agoAllow none lockscreen with multiple users
Adrian Roos [Tue, 7 Apr 2015 14:55:29 +0000 (16:55 +0200)]
Allow none lockscreen with multiple users

Bug: 19962043
Change-Id: Ic7dcbd371d700bf8796f50469a7ac7d529ec491d

9 years agoMerge "Fix crash on rotation while ICE dialog is open"
Adrian Roos [Tue, 7 Apr 2015 14:19:50 +0000 (14:19 +0000)]
Merge "Fix crash on rotation while ICE dialog is open"

9 years agoFix 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

9 years agoMerge "Revert "Update name of field used from BatterySipper""
Bart Sears [Tue, 7 Apr 2015 06:19:47 +0000 (06:19 +0000)]
Merge "Revert "Update name of field used from BatterySipper""

9 years agoRevert "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

9 years agoMerge "Update name of field used from BatterySipper"
Adam Lesinski [Tue, 7 Apr 2015 01:52:57 +0000 (01:52 +0000)]
Merge "Update name of field used from BatterySipper"

9 years agoUpdate 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

9 years agoRemove "Wi-Fi only" option from Wi-Fi Calling settings
Pavel Zhamaitsiak [Tue, 7 Apr 2015 00:01:51 +0000 (17:01 -0700)]
Remove "Wi-Fi only" option from Wi-Fi Calling settings

Bug: 19914582
Change-Id: Iababf6862010812380529440e537958dddbcfdeb

9 years agoMerge "Updated system settings to control BLE scanning"
Lifu Tang [Mon, 6 Apr 2015 22:39:40 +0000 (22:39 +0000)]
Merge "Updated system settings to control BLE scanning"

9 years agoMerge "Added links to scanning settings"
Lifu Tang [Mon, 6 Apr 2015 22:39:28 +0000 (22:39 +0000)]
Merge "Added links to scanning settings"

9 years agoMerge "Update with new assist app ops."
Dianne Hackborn [Mon, 6 Apr 2015 20:21:54 +0000 (20:21 +0000)]
Merge "Update with new assist app ops."

9 years agoUpdated system settings to control BLE scanning
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

9 years agoAdded links to scanning settings
Lifu Tang [Fri, 27 Mar 2015 00:56:19 +0000 (17:56 -0700)]
Added links to scanning settings

Bug: 19918721
Change-Id: Ifb1508807d34b675e9ea1522f86a9310ed6b663f

9 years ago[Fingerprint] Add fingerprint text in setup flow
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoUpdate with new assist app ops.
Dianne Hackborn [Sun, 5 Apr 2015 00:48:18 +0000 (17:48 -0700)]
Update with new assist app ops.

Change-Id: I796845dd1cb3ccfe951e0cbdb7cab55ec476f128

9 years agoZen: Move zen mode preference to switch bar.
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

9 years agoImport translations. DO NOT MERGE
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

9 years agoMerge "Settings: Move downtime to new automation sub-settings page."
John Spurlock [Fri, 3 Apr 2015 23:53:03 +0000 (23:53 +0000)]
Merge "Settings: Move downtime to new automation sub-settings page."

9 years agoImplement 'Available via Passpoint' feature
Vinit Deshpande [Fri, 3 Apr 2015 23:41:36 +0000 (16:41 -0700)]
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

9 years agoMerge "Support for nested bundles in setApplicationRestrictions"
Fyodor Kupolov [Fri, 3 Apr 2015 22:24:40 +0000 (22:24 +0000)]
Merge "Support for nested bundles in setApplicationRestrictions"

9 years agoMerge "Settings - add support for Launch by Default"
Fabrice Di Meglio [Fri, 3 Apr 2015 21:40:03 +0000 (21:40 +0000)]
Merge "Settings - add support for Launch by Default"

9 years agoSettings - 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

9 years agoMerge "Make Settings app not use cleartext network traffic."
Alex Klyubin [Fri, 3 Apr 2015 20:46:08 +0000 (20:46 +0000)]
Merge "Make Settings app not use cleartext network traffic."

9 years agoSettings: Move downtime to new automation sub-settings page.
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

9 years agoMerge "Settings: Move priority configuration to its own sub-settings page."
John Spurlock [Fri, 3 Apr 2015 20:07:54 +0000 (20:07 +0000)]
Merge "Settings: Move priority configuration to its own sub-settings page."

9 years agoSettings: 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

9 years agoSupport for nested bundles in setApplicationRestrictions
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

9 years agoMerge "Show current screen lock as summary"
Jason Monk [Fri, 3 Apr 2015 14:56:52 +0000 (14:56 +0000)]
Merge "Show current screen lock as summary"

9 years agoMerge "Settings: Support new alarms-only zen value."
John Spurlock [Fri, 3 Apr 2015 03:03:45 +0000 (03:03 +0000)]
Merge "Settings: Support new alarms-only zen value."

9 years agoSettings: 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

9 years agoam 483d7989: am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"
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

9 years agoMake Settings app not use cleartext network traffic.
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

9 years agoam ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"
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

9 years agoam 189d7e8e: Merge "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

9 years agoMerge "Add Europe/Istanbul timezone"
Elliott Hughes [Thu, 2 Apr 2015 17:19:27 +0000 (17:19 +0000)]
Merge "Add Europe/Istanbul timezone"

9 years agoAdd Europe/Istanbul timezone
Samuel Asteberg [Mon, 22 Sep 2014 10:24:40 +0000 (12:24 +0200)]
Add Europe/Istanbul timezone

Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83

9 years agoMerge "Add default emergency app setting"
Adrian Roos [Thu, 2 Apr 2015 15:22:58 +0000 (15:22 +0000)]
Merge "Add default emergency app setting"

9 years agoAdd 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

9 years agoMerge "provide better instructions for adding settings views."
Chris Wren [Thu, 2 Apr 2015 14:15:45 +0000 (14:15 +0000)]
Merge "provide better instructions for adding settings views."

9 years agoprovide 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

9 years agoMerge "Prepare to make Fingerprint API public."
Jim Miller [Thu, 2 Apr 2015 03:09:56 +0000 (03:09 +0000)]
Merge "Prepare to make Fingerprint API public."

9 years agoMerge changes from topic 'mwd-merge-040115'
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

9 years agoam 14083abb: am 144c48e7: am 49fe5084: Merge "add Recife timezone"
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

9 years agoam 144c48e7: am 49fe5084: Merge "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

9 years agoPrepare to make Fingerprint API public.
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

9 years agoam 49fe5084: Merge "add Recife timezone"
Elliott Hughes [Thu, 2 Apr 2015 01:13:17 +0000 (01:13 +0000)]
am 49fe5084: Merge "add Recife timezone"

* commit '49fe5084f73821906572f60bd542ca5042cb794d':
  add Recife timezone

9 years agoMerge "add Recife timezone"
Elliott Hughes [Wed, 1 Apr 2015 23:55:55 +0000 (23:55 +0000)]
Merge "add Recife timezone"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 1 Apr 2015 12:26:32 +0000 (12:26 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport 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