OSDN Git Service
Sudheer Shanka [Wed, 27 Jan 2016 15:15:06 +0000 (15:15 +0000)]
Merge "Add padlocks to more preferences in wireless settings."
Abodunrinwa Toki [Wed, 27 Jan 2016 15:12:02 +0000 (15:12 +0000)]
Merge "Settings app: Remove "Toggle keyboard shortcuts helper" button"
Geoff Mendal [Wed, 27 Jan 2016 14:44:12 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 27 Jan 2016 14:35:44 +0000 (06:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iac589baa34417f61e2b483886f14d51ea81c90e3
Auto-generated-cl: translation import
Jason Monk [Wed, 27 Jan 2016 14:19:42 +0000 (14:19 +0000)]
Merge changes I81380323,I0cce76f3
* changes:
Add wallpaper suggestion if one isn't set.
Add DND Suggestion after 30 days
Clara Bayarri [Wed, 27 Jan 2016 12:50:09 +0000 (12:50 +0000)]
Merge "Fix Profile Fingerprint Settings to use correct user id"
Clara Bayarri [Tue, 26 Jan 2016 16:36:48 +0000 (16:36 +0000)]
Fix Profile Fingerprint Settings to use correct user id
Bug:
26790762
Change-Id: Id813c03041e6e727f535ec63f63ee8b187b06164
Abodunrinwa Toki [Wed, 27 Jan 2016 11:52:24 +0000 (11:52 +0000)]
Merge "Fix comment."
Abodunrinwa Toki [Wed, 27 Jan 2016 11:51:27 +0000 (11:51 +0000)]
Fix comment.
Change-Id: Ie4a535d2bf46a1ac3380ca8dbcf0b6665760ecb2
Clara Bayarri [Wed, 27 Jan 2016 10:59:09 +0000 (10:59 +0000)]
Merge "Show unification option only when it will result in a compliant lock"
Rubin Xu [Wed, 27 Jan 2016 00:35:52 +0000 (00:35 +0000)]
Merge "resolve merge conflicts of
55d7fcbfc2 to "
Rubin Xu [Wed, 27 Jan 2016 00:34:53 +0000 (00:34 +0000)]
resolve merge conflicts of
55d7fcbfc2 to master.
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
Shishir Agrawal [Wed, 27 Jan 2016 00:32:29 +0000 (00:32 +0000)]
Merge "Unhiding MSIM APIs."
Rubin Xu [Wed, 27 Jan 2016 00:26:59 +0000 (00:26 +0000)]
Merge "Support multiple CA certs when editing a saved Wifi network." into mm-wireless-dev
Rubin Xu [Sun, 29 Nov 2015 15:25:57 +0000 (15:25 +0000)]
Support multiple CA certs when editing a saved Wifi network.
SSID with multiple CA certs can only be added programmtically. However it
can still be edited in the UI by long-pressing the item when currently
connected to the network. This change makes sure the UI shows up with
meaningful indications that the SSID is configured with multiple CA certs.
Bug:
22547958
Change-Id: I5d42313efb141db521dd09ff3fbc520915b6fb79
Sudheer Shanka [Tue, 26 Jan 2016 13:50:23 +0000 (13:50 +0000)]
Add padlocks to more preferences in wireless settings.
Also set the userRestriction attribute in xml instead of
checking in WirelessSettings class and set useAdminDisabledSummary
attribute.
Change-Id: I0494bd18752425f9d4f3f7d0f64f21fcba0d26da
Udam Saini [Wed, 27 Jan 2016 00:18:41 +0000 (00:18 +0000)]
Merge "Removes fingerprint onboard screen"
Udam Saini [Tue, 26 Jan 2016 23:48:37 +0000 (15:48 -0800)]
Removes fingerprint onboard screen
This screen isn't used anymore. This also fixes some fingerprint
work in setup wizard to use the userId instead.
Change-Id: Icb1debaf7b2766069a53a75eab6152d6b816b03c
Udam Saini [Tue, 26 Jan 2016 23:29:16 +0000 (23:29 +0000)]
Merge "Fixes a bug where user couldnt add a new fingerprint"
Udam Saini [Tue, 26 Jan 2016 23:08:20 +0000 (15:08 -0800)]
Fixes a bug where user couldnt add a new fingerprint
Short term fix as there seems to be more user related that
need to be fixed in here (renaming/deleting fingerprint)
in the fingerprint manager
bug:
26799512
Change-Id: I5a5d63b0682095a31eeb4cdf07322a3129b0f343
Jason Monk [Tue, 26 Jan 2016 22:43:57 +0000 (17:43 -0500)]
Add wallpaper suggestion if one isn't set.
Change-Id: I81380323f0d4f5af842a81028a763219958833bc
Sudheer Shanka [Tue, 26 Jan 2016 22:36:06 +0000 (22:36 +0000)]
Merge "Update the text shown when admin disabled fingerprint as unlock option."
Jason Monk [Tue, 26 Jan 2016 22:21:04 +0000 (17:21 -0500)]
Add DND Suggestion after 30 days
Suggest users setup automatic rules if they haven't after 30 days
Also fix the id labeling for the RV adapter, so that it can handle
removing of suggestions properly.
Change-Id: I0cce76f3db1d444011f7d8a31348714d102650cf
Sudheer Shanka [Tue, 26 Jan 2016 22:29:43 +0000 (22:29 +0000)]
Merge "Add restricted padlock support for listpreference."
Shishir Agrawal [Mon, 25 Jan 2016 22:05:32 +0000 (14:05 -0800)]
Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.
Bug:
26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
Sudheer Shanka [Wed, 13 Jan 2016 15:16:55 +0000 (15:16 +0000)]
Add restricted padlock support for listpreference.
Change-Id: I1f3284a474d225df803abd57dd71382cb1dfa659
Julia Reynolds [Tue, 26 Jan 2016 21:21:05 +0000 (21:21 +0000)]
Merge "Show app level settings when app doesn't use topics."
Philip P. Moltmann [Tue, 26 Jan 2016 21:17:51 +0000 (21:17 +0000)]
Merge "No need to declare minSdkVersion for Settings app."
Philip P. Moltmann [Tue, 26 Jan 2016 21:14:42 +0000 (13:14 -0800)]
No need to declare minSdkVersion for Settings app.
Change-Id: I2b221ed2bb410578e57475dbbe0106826bfc3f76
Abodunrinwa Toki [Tue, 26 Jan 2016 20:23:42 +0000 (20:23 +0000)]
Settings app: Remove "Toggle keyboard shortcuts helper" button
Change-Id: I93bd51a05a8922e02e4e09add94d247442f67334
Abodunrinwa Toki [Tue, 26 Jan 2016 21:00:46 +0000 (21:00 +0000)]
Merge "Input settings: Associate keyboard layouts with device/IME subtype."
Abodunrinwa Toki [Tue, 26 Jan 2016 20:59:15 +0000 (20:59 +0000)]
Merge "Settings app: Include package icons in list of virtual keyboards"
Abodunrinwa Toki [Mon, 25 Jan 2016 23:02:23 +0000 (23:02 +0000)]
Input settings: Associate keyboard layouts with device/IME subtype.
Implements selection of keyboard layouts using the new InputManager
methods that associate keyboard layouts to
device/InputMethodInfo/InputMethodSubtype
See: Ie88ce1ab77dbfe03ab51d89c1dc9e0a7ddbb3216
Bug:
25752812
Change-Id: Ib76880d66391ca37978054de80f4b3b5147cecc3
Julia Reynolds [Mon, 25 Jan 2016 21:37:28 +0000 (16:37 -0500)]
Show app level settings when app doesn't use topics.
Change-Id: I3c31a1bdddc70077182ea910911de1444472b7a9
Jason Monk [Tue, 26 Jan 2016 19:52:56 +0000 (19:52 +0000)]
Merge "Support changes to SuggestionParser"
Maria Garcia Puyol [Tue, 26 Jan 2016 19:00:51 +0000 (19:00 +0000)]
Merge "Add Emergency Info preference to user settings"
Jason Monk [Tue, 26 Jan 2016 18:58:25 +0000 (13:58 -0500)]
Support changes to SuggestionParser
Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
mariagpuyol [Tue, 26 Jan 2016 03:32:22 +0000 (19:32 -0800)]
Add Emergency Info preference to user settings
Bug:
23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
Sudheer Shanka [Tue, 26 Jan 2016 18:41:19 +0000 (18:41 +0000)]
Merge "Add policy disabled msg as empty views in zenmode related fragments."
Philip P. Moltmann [Tue, 26 Jan 2016 18:25:54 +0000 (18:25 +0000)]
Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly."
Shishir Agrawal [Tue, 26 Jan 2016 18:03:51 +0000 (18:03 +0000)]
DO NOT MERGE : Unhiding MSIM APIs.
am:
2e1370e9a5 -s ours
* commit '
2e1370e9a5575ee92891f7e9fac25cf597e0354d':
DO NOT MERGE : Unhiding MSIM APIs.
Shishir Agrawal [Mon, 25 Jan 2016 22:05:32 +0000 (14:05 -0800)]
DO NOT MERGE : Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.
Bug:
26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
Clara Bayarri [Tue, 26 Jan 2016 15:51:27 +0000 (15:51 +0000)]
Merge "Profile Challenge Fingerprint Support"
Clara Bayarri [Mon, 25 Jan 2016 13:20:17 +0000 (13:20 +0000)]
Show unification option only when it will result in a compliant lock
Change-Id: I05ce21e8949c81313bc686273a9cec93bf5f2a9f
Clara Bayarri [Thu, 7 Jan 2016 17:10:27 +0000 (17:10 +0000)]
Profile Challenge Fingerprint Support
Change-Id: Ic83c479f645776dd0678721bfb732b399f09c992
Jason Monk [Fri, 22 Jan 2016 20:28:16 +0000 (15:28 -0500)]
Remove info icon from app header
Instead make the app header clickable, launch if coming from app list
and finish if coming from app info.
Bug:
26288458
Change-Id: I7f10a2385356107812dedc8de5d5761b1200e320
Jason Monk [Tue, 26 Jan 2016 14:46:05 +0000 (14:46 +0000)]
Merge "Only show settings drawer on top level items"
Jason Monk [Tue, 26 Jan 2016 14:45:25 +0000 (14:45 +0000)]
Merge "Move Home settings to Default apps"
Jason Monk [Fri, 22 Jan 2016 19:28:02 +0000 (14:28 -0500)]
Move Home settings to Default apps
Change-Id: I2ac7f9dd2c1c505ff3163b2a90c574a360b9409c
Sudheer Shanka [Tue, 26 Jan 2016 14:42:30 +0000 (14:42 +0000)]
Merge "Add padlock to location for work profile when disabled by admin."
Sudheer Shanka [Tue, 26 Jan 2016 14:42:05 +0000 (14:42 +0000)]
Merge "Add preference summary when disabled by admin."
Sudheer Shanka [Mon, 25 Jan 2016 23:34:20 +0000 (23:34 +0000)]
Add padlock to location for work profile when disabled by admin.
Change-Id: Iee930c9340436cc68ee432ad15ec182ccc6fb0a1
Vladislav Kuzkokov [Tue, 26 Jan 2016 11:05:05 +0000 (11:05 +0000)]
Merge "Add "Manage backup data" item to "Backup & Reset" settings."
Bartosz Fabianowski [Tue, 26 Jan 2016 09:38:42 +0000 (09:38 +0000)]
Merge "Allow user to specify whether a new network is shared or private"
Benjamin Franz [Tue, 26 Jan 2016 09:30:49 +0000 (09:30 +0000)]
Merge "Add SmallTest annotation to UserCredentialsTest"
Jeremy Klein [Mon, 25 Jan 2016 01:21:43 +0000 (17:21 -0800)]
Add a TetherProvisioningActivity for ui-based provisioning.
This activity acts as a proxy between Tethering.java and the oem
provisioning app on the device. It starts the provisioning app and
relays the response back to a ResultReceiver callback.
BUG:
26247383
Change-Id: I35fa6cf45f8ebacceac3e3500b89c798a650caf0
Jeremy Klein [Tue, 26 Jan 2016 03:59:53 +0000 (03:59 +0000)]
Merge "Allow TetherService to take a callback to receiver provision results."
Jeremy Klein [Sat, 23 Jan 2016 00:14:05 +0000 (16:14 -0800)]
Allow TetherService to take a callback to receiver provision results.
See ag/850685 for corresponding framework changes. This is being done
as part of exposing a cleaner tethering API which will be used by
Quick Settings and Settings.
BUG:
26247383
Change-Id: I061b8b8b2b0c5bbe98f50deb051e2bfb8e773d61
Tony Mantler [Mon, 25 Jan 2016 23:06:45 +0000 (23:06 +0000)]
Merge "Move AccessPointPreference to SettingsLib"
Udam Saini [Mon, 25 Jan 2016 23:02:32 +0000 (23:02 +0000)]
Merge "Improves flow for fingerprint"
Sudheer Shanka [Mon, 25 Jan 2016 22:39:34 +0000 (22:39 +0000)]
Add preference summary when disabled by admin.
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
Abodunrinwa Toki [Sat, 23 Jan 2016 16:37:37 +0000 (16:37 +0000)]
Settings app: Include package icons in list of virtual keyboards
Bug:
25752812
Change-Id: I2070de953c92cce90dbf178c9ffdbe300d4c2646
Makoto Onuki [Mon, 25 Jan 2016 22:10:23 +0000 (22:10 +0000)]
Merge "Add "Uninstall" button to device admin activation dialog."
Makoto Onuki [Fri, 22 Jan 2016 23:21:56 +0000 (15:21 -0800)]
Add "Uninstall" button to device admin activation dialog.
Bug
25392386
Change-Id: I91259ddd69bc61a7dd23a2e8b4d08719bc5cacca
Sudheer Shanka [Fri, 22 Jan 2016 22:31:31 +0000 (22:31 +0000)]
Add policy disabled msg as empty views in zenmode related fragments.
Change-Id: I0d7489d2884ffd5c227a37a638d560bf033f5cd9
Sudheer Shanka [Mon, 25 Jan 2016 21:04:13 +0000 (21:04 +0000)]
Merge "Add disabled by policy message as empty views in preferencefragment."
Jason Monk [Mon, 25 Jan 2016 20:36:56 +0000 (20:36 +0000)]
Merge "Add data saver to settings"
Jason Monk [Thu, 21 Jan 2016 19:12:11 +0000 (14:12 -0500)]
Add data saver to settings
Bug:
22817899
Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7
Vladislav Kuzkokov [Mon, 25 Jan 2016 16:51:55 +0000 (17:51 +0100)]
Add "Manage backup data" item to "Backup & Reset" settings.
This patch uses new IBackupManager API. Item's label is taken from
getDataManagementLabel and Item's action is taken from getDataManagementIntent.
If getDataManagementIntent is null (or backup service is unresponsive)
the item is not displayed.
Change-Id: I19cbf7fa625fccff751f923aa41b7d64ccb6c1d3
Geoff Mendal [Mon, 25 Jan 2016 18:55:43 +0000 (10:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3a891ae3544d89fd096c653c8f3c9792f14c5419
Auto-generated-cl: translation import
Tony Mantler [Fri, 22 Jan 2016 22:59:22 +0000 (14:59 -0800)]
Move AccessPointPreference to SettingsLib
Change-Id: Ib4a7c64e976aed5e75ec04fa72e2fdbd12923371
Benjamin Franz [Mon, 25 Jan 2016 18:27:18 +0000 (18:27 +0000)]
Add SmallTest annotation to UserCredentialsTest
Also cleaned up the comments and the imports slightly.
Change-Id: Ieea8af1914ff2f78764d33a9ce6b56621c809fcf
Mihai Nita [Mon, 25 Jan 2016 18:24:22 +0000 (10:24 -0800)]
Fix for build break (http://ag/844107)
The commit removed a string that was still used by AndroidManifest.xml
Change-Id: I32633546cfebcbb96066d80ff801c1d49b435f59
Bartosz Fabianowski [Wed, 16 Dec 2015 16:15:25 +0000 (17:15 +0100)]
Allow user to specify whether a new network is shared or private
* Add a check box to the WiFi configuration dialog that lets the user
choose whether a newly created configuration is shared with other
users (defaults to true)
* Disable the check box when modifying an existing network
BUG=
25600871
Change-Id: Ifc6713602ee61b0407e55f45097c1b311fa19cb4
Udam Saini [Mon, 25 Jan 2016 16:06:57 +0000 (08:06 -0800)]
Improves flow for fingerprint
This reduces the # of screens, and makes the backup lock choice
for fingerprint more obvious that it is a backup.
bug:
26377096
Change-Id: I4e75e1f3302c286587de106bcdf43537bda03390
Geoff Mendal [Mon, 25 Jan 2016 15:38:38 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
df9f6fc49d -s ours
am:
27fd447a4d -s ours
* commit '
27fd447a4d8fe4189cd20c046a2f3caa5887824a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:36:19 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
df9f6fc49d -s ours
* commit '
df9f6fc49d769835179343a2217cb9fc750d4942':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:34:28 +0000 (15:34 +0000)]
Import translations. DO NOT MERGE am:
13391af4fc -s ours am:
6142ec45b9 -s ours
am:
4b93474e68 -s ours
* commit '
4b93474e68b8e3a776ee29d70d035941b1ebe6bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:34:18 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 25 Jan 2016 15:32:50 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:32:29 +0000 (15:32 +0000)]
Import translations. DO NOT MERGE am:
13391af4fc -s ours
am:
6142ec45b9 -s ours
* commit '
6142ec45b92457e4119af1408a68bc92117935e8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:30:39 +0000 (15:30 +0000)]
Import translations. DO NOT MERGE
am:
13391af4fc -s ours
* commit '
13391af4fc4d095d2c94b388e441e34645ef7f68':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:24:17 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
Sudheer Shanka [Fri, 22 Jan 2016 20:40:56 +0000 (20:40 +0000)]
Update the text shown when admin disabled fingerprint as unlock option.
When the admin has disabled fingerprint as unlock option, we let the
user know that the admin has disabled that option with a more details
link which will trigger the admin support dialog. And made some small
fixes apart from this.
Change-Id: I01021b952dc6fb29a65d37401a6411a6088d5cef
Geoff Mendal [Mon, 25 Jan 2016 14:54:16 +0000 (14:54 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Geoff Mendal [Mon, 25 Jan 2016 14:53:23 +0000 (14:53 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
098199b6144379c8321555b7f54ed55a443f3bbc.
Change-Id: Ie756851719c5324ef866be4a56f8d97180610e44
Geoff Mendal [Mon, 25 Jan 2016 14:36:37 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 14:34:44 +0000 (06:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89b37a2718f15f037dfa28fb00e983568b1b1104
Auto-generated-cl: translation import
Benjamin Franz [Mon, 25 Jan 2016 14:11:26 +0000 (14:11 +0000)]
Move UserCredentialsTests to unit/
Change-Id: I17bf5fe982016ffc296ade198a74149dc0bd2ddf
Sudheer Shanka [Tue, 12 Jan 2016 10:36:18 +0000 (10:36 +0000)]
Add disabled by policy message as empty views in preferencefragment.
Change-Id: I296dc02c8e5cbea74f8415f4c8c5723f85e20b5b
Clara Bayarri [Mon, 25 Jan 2016 13:49:34 +0000 (13:49 +0000)]
Merge "Unify profile and device lock by setting the work lock on the device"
Clara Bayarri [Thu, 21 Jan 2016 11:43:08 +0000 (11:43 +0000)]
Unify profile and device lock by setting the work lock on the device
Bug:
26577742
Change-Id: I83cae9749d27637745c13f25ac19669b03a3c4bc
Clara Bayarri [Mon, 25 Jan 2016 13:33:06 +0000 (13:33 +0000)]
Merge "Fix Confirm/Choose Credentials strings related to profile"
Clara Bayarri [Fri, 22 Jan 2016 14:59:24 +0000 (14:59 +0000)]
Fix Confirm/Choose Credentials strings related to profile
The messages in ConfirmDeviceCredentials have been updated to
inform the user that the pattern/pin/password to be entered is
the profile one.
The strings in the confirmation dialog when the user removes
the lock have also been updated.
Ideally we would have a parametrized approach to strings here,
but capitalization makes it a hard problem.
Bug:
26706338,
26709116
Change-Id: I9f5508d6f449f9e572d65e5b2dcb15cca23832b3
Robin Lee [Mon, 25 Jan 2016 12:42:30 +0000 (12:42 +0000)]
Merge "Test: parcel marshalling for user credentials page"
Robin Lee [Mon, 25 Jan 2016 12:24:27 +0000 (12:24 +0000)]
Test: parcel marshalling for user credentials page
Unit test to verify that the internal Credential that gets passed to
dialogs for removing said credential is actually a valid Parcelable
object, since it's hard to provoke a marshal/unmarshal in real-world
usage (but not impossible).
Bug:
22541933
Change-Id: I780ca2d7b01fc6081b9ea8b2810cfc97f0433a86
Benjamin Franz [Mon, 25 Jan 2016 10:58:50 +0000 (10:58 +0000)]
Merge "Change build targets for settings tests"
Abodunrinwa Toki [Sat, 23 Jan 2016 15:36:49 +0000 (15:36 +0000)]
Merge "Change Input Settings UI flow."
Steve Pfetsch [Sat, 23 Jan 2016 01:43:33 +0000 (17:43 -0800)]
resolve merge conflicts of
259b6a8029 to master.
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
Steve Pfetsch [Fri, 22 Jan 2016 22:29:47 +0000 (22:29 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am:
76b29667df
am:
5ff50f2072
* commit '
5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
Added toast message to color temperature setting
OSDN Git Service
