Commit Graph

24860 Commits

Author SHA1 Message Date
Abodunrinwa Toki
c043de9fbf Merge "Settings app: Include package icons in list of virtual keyboards" 2016-01-26 20:59:15 +00:00
Jason Monk
2e634f872e Merge "Support changes to SuggestionParser" 2016-01-26 19:52:56 +00:00
Maria Garcia Puyol
4ec12f7703 Merge "Add Emergency Info preference to user settings" 2016-01-26 19:00:51 +00:00
Jason Monk
91ca519a0f Support changes to SuggestionParser
Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
2016-01-26 13:58:25 -05:00
mariagpuyol
0401388028 Add Emergency Info preference to user settings
Bug: 23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
2016-01-26 10:58:10 -08:00
Sudheer Shanka
b2ed2d8583 Merge "Add policy disabled msg as empty views in zenmode related fragments." 2016-01-26 18:41:19 +00:00
Philip P. Moltmann
1147faa461 Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly." 2016-01-26 18:25:54 +00:00
Shishir Agrawal
3cc18408c6 DO NOT MERGE : Unhiding MSIM APIs.
am: 2e1370e9a5  -s ours

* commit '2e1370e9a5575ee92891f7e9fac25cf597e0354d':
  DO NOT MERGE : Unhiding MSIM APIs.
2016-01-26 18:03:51 +00:00
Shishir Agrawal
2e1370e9a5 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
2016-01-26 09:32:39 -08:00
Clara Bayarri
0ed7d8cb3e Merge "Profile Challenge Fingerprint Support" 2016-01-26 15:51:27 +00:00
Clara Bayarri
40db4bbbb5 Profile Challenge Fingerprint Support
Change-Id: Ic83c479f645776dd0678721bfb732b399f09c992
2016-01-26 15:45:37 +00:00
Jason Monk
b2e357c788 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
2016-01-26 14:46:43 +00:00
Jason Monk
7eda1c5fa1 Merge "Only show settings drawer on top level items" 2016-01-26 14:46:05 +00:00
Jason Monk
7cd90e012c Merge "Move Home settings to Default apps" 2016-01-26 14:45:25 +00:00
Jason Monk
7ea14c5625 Move Home settings to Default apps
Change-Id: I2ac7f9dd2c1c505ff3163b2a90c574a360b9409c
2016-01-26 09:44:39 -05:00
Sudheer Shanka
4e88857db7 Merge "Add padlock to location for work profile when disabled by admin." 2016-01-26 14:42:30 +00:00
Sudheer Shanka
052916efcb Merge "Add preference summary when disabled by admin." 2016-01-26 14:42:05 +00:00
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
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
Geoff Mendal
764d0d272c Merge "Revert "Import translations. DO NOT MERGE"" 2016-01-25 14:54:16 +00:00