Commit Graph

25097 Commits

Author SHA1 Message Date
Sudheer Shanka
0d9ac3469b Add padlock to location for work profile when disabled by admin.
Change-Id: Iee930c9340436cc68ee432ad15ec182ccc6fb0a1
2016-01-26 14:29:04 +00:00
Vladislav Kuzkokov
1b4e746a7f Merge "Add "Manage backup data" item to "Backup & Reset" settings." 2016-01-26 11:05:05 +00:00
Bartosz Fabianowski
d40c11a7d5 Merge "Allow user to specify whether a new network is shared or private" 2016-01-26 09:38:42 +00:00
Benjamin Franz
f733e93a94 Merge "Add SmallTest annotation to UserCredentialsTest" 2016-01-26 09:30:49 +00:00
Noah Wang
33712a7fb4 Reflect settings change right after interaction
Change-Id: I3e15925e19f65c6de62a844fb51b242d71bb4d4e
2016-01-25 22:32:00 -08:00
Noah Wang
b25ccce111 Adding placeholder for preview screens for screen zoom (magnifying screen)
Change-Id: I61f89b0506c9d18205fc79058c89fc4390866129
2016-01-25 21:51:29 -08:00
Jeremy Klein
1cf002d070 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
2016-01-25 20:02:48 -08:00
Jeremy Klein
f7f171d957 Merge "Allow TetherService to take a callback to receiver provision results." 2016-01-26 03:59:53 +00:00
Jeremy Klein
8a934767dc 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
2016-01-25 15:09:48 -08:00
Tony Mantler
6d70e7dce3 Merge "Move AccessPointPreference to SettingsLib" 2016-01-25 23:06:45 +00:00
Udam Saini
af677ddda4 Merge "Improves flow for fingerprint" 2016-01-25 23:02:32 +00:00
Sudheer Shanka
ba1a68b8ab Add preference summary when disabled by admin.
Change-Id: Iaa84e66b0abe0fccde50f116cbf6e68c6abbabc0
2016-01-25 22:39:34 +00:00
Abodunrinwa Toki
567ebd68e1 Settings app: Include package icons in list of virtual keyboards
Bug: 25752812
Change-Id: I2070de953c92cce90dbf178c9ffdbe300d4c2646
2016-01-25 22:19:23 +00:00
Makoto Onuki
7a89f68f95 Merge "Add "Uninstall" button to device admin activation dialog." 2016-01-25 22:10:23 +00:00
Makoto Onuki
c548848fba Add "Uninstall" button to device admin activation dialog.
Bug 25392386

Change-Id: I91259ddd69bc61a7dd23a2e8b4d08719bc5cacca
2016-01-25 14:09:24 -08:00
Sudheer Shanka
366d8809c8 Add policy disabled msg as empty views in zenmode related fragments.
Change-Id: I0d7489d2884ffd5c227a37a638d560bf033f5cd9
2016-01-25 21:10:24 +00:00
Sudheer Shanka
20c9817713 Merge "Add disabled by policy message as empty views in preferencefragment." 2016-01-25 21:04:13 +00:00
Jason Monk
e3bd8f0dc4 Merge "Add data saver to settings" 2016-01-25 20:36:56 +00:00
Jason Monk
764f45db91 Add data saver to settings
Bug: 22817899

Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7
2016-01-25 15:24:29 -05:00
Vladislav Kuzkokov
ddb953fb73 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
2016-01-25 21:11:45 +01:00
Geoff Mendal
1092be7f0b Import translations. DO NOT MERGE
Change-Id: I3a891ae3544d89fd096c653c8f3c9792f14c5419
Auto-generated-cl: translation import
2016-01-25 10:55:43 -08:00
Tony Mantler
99b255c8a5 Move AccessPointPreference to SettingsLib
Change-Id: Ib4a7c64e976aed5e75ec04fa72e2fdbd12923371
2016-01-25 10:42:53 -08:00
Benjamin Franz
d72fffea1b Add SmallTest annotation to UserCredentialsTest
Also cleaned up the comments and the imports slightly.

Change-Id: Ieea8af1914ff2f78764d33a9ce6b56621c809fcf
2016-01-25 18:27:18 +00:00
Mihai Nita
0fdbfe4928 Fix for build break (http://ag/844107)
The commit removed a string that was still used by AndroidManifest.xml

Change-Id: I32633546cfebcbb96066d80ff801c1d49b435f59
2016-01-25 10:26:43 -08:00
Bartosz Fabianowski
1058c0cc3d 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
2016-01-25 18:47:39 +01:00
Udam Saini
bf1483c383 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
2016-01-25 09:19:02 -08:00
Geoff Mendal
3833c6f8ec 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
2016-01-25 15:38:38 +00:00
Geoff Mendal
27fd447a4d Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: df9f6fc49d  -s ours

* commit 'df9f6fc49d769835179343a2217cb9fc750d4942':
  Import translations. DO NOT MERGE
2016-01-25 15:36:19 +00:00
Geoff Mendal
9131ab116a Import translations. DO NOT MERGE am: 13391af4fc -s ours am: 6142ec45b9 -s ours
am: 4b93474e68  -s ours

* commit '4b93474e68b8e3a776ee29d70d035941b1ebe6bd':
  Import translations. DO NOT MERGE
2016-01-25 15:34:28 +00:00
Geoff Mendal
df9f6fc49d Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-01-25 15:34:18 +00:00
Geoff Mendal
03daf69ed0 Import translations. DO NOT MERGE
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
2016-01-25 07:32:50 -08:00
Geoff Mendal
4b93474e68 Import translations. DO NOT MERGE am: 13391af4fc -s ours
am: 6142ec45b9  -s ours

* commit '6142ec45b92457e4119af1408a68bc92117935e8':
  Import translations. DO NOT MERGE
2016-01-25 15:32:29 +00:00
Geoff Mendal
6142ec45b9 Import translations. DO NOT MERGE
am: 13391af4fc  -s ours

* commit '13391af4fc4d095d2c94b388e441e34645ef7f68':
  Import translations. DO NOT MERGE
2016-01-25 15:30:39 +00:00
Geoff Mendal
13391af4fc Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
2016-01-25 07:24:17 -08:00
Sudheer Shanka
5590e2eb44 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
2016-01-25 15:12:07 +00:00
Geoff Mendal
764d0d272c Merge "Revert "Import translations. DO NOT MERGE"" 2016-01-25 14:54:16 +00:00
Geoff Mendal
589f0dd32c Revert "Import translations. DO NOT MERGE"
This reverts commit 098199b614.

Change-Id: Ie756851719c5324ef866be4a56f8d97180610e44
2016-01-25 14:53:23 +00:00
Geoff Mendal
c7c79f8398 Merge "Import translations. DO NOT MERGE" 2016-01-25 14:36:37 +00:00
Geoff Mendal
098199b614 Import translations. DO NOT MERGE
Change-Id: I89b37a2718f15f037dfa28fb00e983568b1b1104
Auto-generated-cl: translation import
2016-01-25 06:34:44 -08:00
Benjamin Franz
12f5e7b13e Move UserCredentialsTests to unit/
Change-Id: I17bf5fe982016ffc296ade198a74149dc0bd2ddf
2016-01-25 14:11:26 +00:00
Sudheer Shanka
95a71e06eb Add disabled by policy message as empty views in preferencefragment.
Change-Id: I296dc02c8e5cbea74f8415f4c8c5723f85e20b5b
2016-01-25 14:05:46 +00:00
Clara Bayarri
3d71918c58 Merge "Unify profile and device lock by setting the work lock on the device" 2016-01-25 13:49:34 +00:00
Clara Bayarri
52db3d98c1 Unify profile and device lock by setting the work lock on the device
Bug: 26577742
Change-Id: I83cae9749d27637745c13f25ac19669b03a3c4bc
2016-01-25 13:43:21 +00:00
Clara Bayarri
14ff9a91fa Merge "Fix Confirm/Choose Credentials strings related to profile" 2016-01-25 13:33:06 +00:00
Clara Bayarri
34ec5f97fe 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
2016-01-25 13:20:55 +00:00
Robin Lee
7b8f2354f4 Merge "Test: parcel marshalling for user credentials page" 2016-01-25 12:42:30 +00:00
Robin Lee
e26804208c 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
2016-01-25 12:27:31 +00:00
Benjamin Franz
090e37b5f2 Merge "Change build targets for settings tests" 2016-01-25 10:58:50 +00:00
Abodunrinwa Toki
a16852480f Merge "Change Input Settings UI flow." 2016-01-23 15:36:49 +00:00
Steve Pfetsch
f002f23f91 resolve merge conflicts of 259b6a8029 to master.
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
2016-01-22 17:43:33 -08:00