OSDN Git Service
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 [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
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.
Stuart Scott [Wed, 25 Mar 2015 22:45:13 +0000 (15:45 -0700)]
Forget Wifi SSID
Change-Id: I6d4bf3117d92567f89a8eedf41a430ee5342b6c6
Jason Monk [Thu, 26 Mar 2015 12:40:43 +0000 (12:40 +0000)]
Merge "Fix managed profile bugs in manage apps list"
Jason Monk [Wed, 25 Mar 2015 18:47:01 +0000 (14:47 -0400)]
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
Vinit Deshpande [Wed, 25 Mar 2015 22:42:00 +0000 (22:42 +0000)]
Merge "Fix settings UI for passpoint networks" into m-wireless-dev
Vinit Deshpande [Wed, 25 Mar 2015 02:10:42 +0000 (19:10 -0700)]
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
Stuart Scott [Wed, 25 Mar 2015 22:27:52 +0000 (22:27 +0000)]
Merge "Dont access PhoneFactory, as it could have been inited in another JVM."
Stuart Scott [Wed, 25 Mar 2015 22:13:51 +0000 (22:13 +0000)]
am
f6432118: am
4a682e56: am
c28e80b8: am
53eec9fa: Fix sim notifications.
* commit '
f64321184cbe64ab010ffd2fde9bbd543bec9299':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 22:04:59 +0000 (22:04 +0000)]
am
4a682e56: am
c28e80b8: am
53eec9fa: Fix sim notifications.
* commit '
4a682e56c80435e1f3ce7bc8ae848337a2426fc3':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 20:34:04 +0000 (20:34 +0000)]
am
c28e80b8: am
53eec9fa: Fix sim notifications.
* commit '
c28e80b8fb1a4fd6d326bbb79547f3597cf0412f':
Fix sim notifications.
Prerepa Viswanadham [Wed, 25 Mar 2015 19:59:48 +0000 (19:59 +0000)]
Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"
Stuart Scott [Wed, 25 Mar 2015 19:48:23 +0000 (19:48 +0000)]
am
53eec9fa: Fix sim notifications.
* commit '
53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
Jim Miller [Wed, 25 Mar 2015 19:46:01 +0000 (19:46 +0000)]
Merge "Update Settings to use new fingerprint API"
Jason Monk [Wed, 25 Mar 2015 19:34:45 +0000 (19:34 +0000)]
Merge "Allow system apps to add to settings dashboard"
Stuart Scott [Wed, 25 Mar 2015 19:02:51 +0000 (19:02 +0000)]
am
53eec9fa: Fix sim notifications.
automerge:
a76d35d
* commit '
a76d35dece5fe50db4712cd47c147ba7759955b3':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 18:51:18 +0000 (18:51 +0000)]
am
53eec9fa: Fix sim notifications.
* commit '
53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
Stuart Scott [Mon, 16 Mar 2015 19:17:56 +0000 (12:17 -0700)]
Fix sim notifications.
bug:
19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
Jason Monk [Wed, 25 Mar 2015 16:31:14 +0000 (16:31 +0000)]
Merge "Add running services screen to developer options"
Jason Monk [Wed, 25 Mar 2015 15:03:59 +0000 (11:03 -0400)]
Add running services screen to developer options
This used to live under manage apps, but does no longer.
Bug:
19926589
Change-Id: I2554f14205286cc38fc87779873c37a5a1f80c4e
Jason Monk [Fri, 13 Feb 2015 20:23:19 +0000 (15:23 -0500)]
Allow system apps to add to settings dashboard
Allow system apps to add a tile to the top level of settings that
links to an activity through adding a filter for a specific action.
Determine the info for the tile based off manifest info for the
activity. Also allow the same for managed profiles, but show a dialog
in between to select which profile.
The category in which the item is to be placed must be in meta-data.
The icon and title can be specified through meta-data as well or
if unspecified the activity's label and icon will be used.
Also added an optional <external-tiles> tag to the dashboard
category xml, this allows Settings to put external tiles
in the middle of some categories (Personal does this).
Bug:
19443117
Change-Id: Idc9938d1549d181103a3030a8784b527215a8399
Geoff Mendal [Wed, 25 Mar 2015 13:10:44 +0000 (08:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: I8c6e884fd6411845209ce454d98fdb653a1d6158
Auto-generated-cl: translation import
Svet Ganov [Tue, 24 Mar 2015 23:31:57 +0000 (16:31 -0700)]
Lauch manage permissions UI from settings
Change-Id: I96f75ebfb4c3984b7e93abf1de41963aa67d4cbd
Prerepa Viswanadham [Wed, 25 Mar 2015 02:08:43 +0000 (19:08 -0700)]
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Fix build in DevelopmentSettings.java
Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
Nitin Arora [Fri, 11 Jul 2014 21:56:06 +0000 (14:56 -0700)]
Increase allowed duration to connect to HOGP profile
This patch increases the duration allowed between the first device
connection attempt (immidiately after bonding) and profile connection
after service discovery from 5 seconds to 30 seconds to allow
HOGP connections for slow connection conditions.
Change-Id: Ia8a33a6ef8951d6e08b4a22837fcfdb70910112c
Lifu Tang [Tue, 24 Mar 2015 23:48:06 +0000 (23:48 +0000)]
Merge "Added a screen to configure wireless scanning"
Jim Miller [Tue, 24 Mar 2015 23:02:59 +0000 (16:02 -0700)]
Update Settings to use new fingerprint API
Bug
16487912
Change-Id: I99ac78f476d43f6b87f5dd20e597c51ed08d2c0e
Geoff Mendal [Tue, 24 Mar 2015 01:33:12 +0000 (01:33 +0000)]
am
d7d1f521: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
d7d1f521a969a783aaf8b9a681b1a9282f5c3224':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 24 Mar 2015 01:33:06 +0000 (01:33 +0000)]
am
4708550a: (-s ours) am
674d1d6b: (-s ours) am
47d342c3: (-s ours) Import translations. DO NOT MERGE
* commit '
4708550ab413d0120cfe0d93daf6f200e49be625':
Import translations. DO NOT MERGE
Stuart Scott [Tue, 24 Mar 2015 00:53:39 +0000 (17:53 -0700)]
Dont access PhoneFactory, as it could have been inited in another JVM.
bug:
19858201
Change-Id: I1684c473407b530d23a8965df3ff9a5353803397
Jim Miller [Tue, 24 Mar 2015 00:27:57 +0000 (00:27 +0000)]
Merge "Fix type-o in fingerprint dialog text"
Geoff Mendal [Mon, 23 Mar 2015 23:24:12 +0000 (23:24 +0000)]
am
18367b64: (-s ours) am
4b52bfbb: (-s ours) am
d20acfeb: (-s ours) Import translations. DO NOT MERGE
* commit '
18367b648b977bf52918bb508a0f628953cfcf6e':
Import translations. DO NOT MERGE
Jim Miller [Mon, 23 Mar 2015 23:17:02 +0000 (16:17 -0700)]
Fix type-o in fingerprint dialog text
Fixes bug
19890194
Change-Id: Id24f3baf6a0105348f4f0e205977191d72bfe132
Lifu Tang [Mon, 23 Mar 2015 20:16:56 +0000 (13:16 -0700)]
Added a screen to configure wireless scanning
- Created "Scanning" preference screen
- Added overflow menu on "Location" settings to access "Scanning" settings
- Moved "Wi-Fi scanning always available" from Wi-Fi settings to "Scanning"
settings
- Added "Bluetooth scanning always available" preference (UI only)
Change-Id: I85d8cd60ab309db5db9caee43f4b5a117192d904
Geoff Mendal [Mon, 23 Mar 2015 22:28:16 +0000 (22:28 +0000)]
am
3cae91d7: (-s ours) Import translations. DO NOT MERGE
* commit '
3cae91d701bade99379b0b681ed16ec736603253':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Mon, 23 Mar 2015 22:11:57 +0000 (22:11 +0000)]
Update Wi-Fi Calling settings
automerge:
ee5f27d
* commit '
ee5f27dbeeef90381de905d05b3b67bc1837df20':
Update Wi-Fi Calling settings