OSDN Git Service
Robin Lee [Wed, 27 Jan 2016 17:21:00 +0000 (17:21 +0000)]
Only setCredentialRequiredToDecrypt if primary user
Change-Id: I3b68cc1169296aa95777e12fa27c3ede4291ec78
Noah Wang [Thu, 28 Jan 2016 19:13:52 +0000 (19:13 +0000)]
Merge "Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen."
Jason Monk [Thu, 28 Jan 2016 18:15:35 +0000 (18:15 +0000)]
Merge "Clean up CellDataPreference dialog problems"
Jason Monk [Thu, 28 Jan 2016 17:35:31 +0000 (12:35 -0500)]
Clean up CellDataPreference dialog problems
Bug:
26830672
Change-Id: I189f8b2120143ca9829feebd24cf2ee93a33f05b
Mihai Nita [Thu, 28 Jan 2016 17:36:09 +0000 (09:36 -0800)]
Sentence-case the locale list.
Bug:
26730313
Change-Id: I015c50cb0e82cf3f5ad88a57d43d39e7202cf62d
Shweta Chahar [Thu, 28 Jan 2016 14:52:37 +0000 (14:52 +0000)]
Merge "Add a seekbar to change text-to-speech rate and a switch to enable higher speech rates."
Daniel Sandler [Thu, 28 Jan 2016 14:24:14 +0000 (14:24 +0000)]
Merge "Revert "Add Emergency Info preference to user settings""
Daniel Sandler [Thu, 28 Jan 2016 03:29:49 +0000 (03:29 +0000)]
Revert "Add Emergency Info preference to user settings"
This reverts commit
0401388028da2c91e7e34dcd952dcd1c289a714d.
Bug:
26831671
Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
Adam Lesinski [Thu, 28 Jan 2016 00:03:57 +0000 (00:03 +0000)]
Merge "Update FakeUid to match new methods in BatteryStats.Uid interface"
shwetachahar [Wed, 27 Jan 2016 16:38:06 +0000 (16:38 +0000)]
Add a seekbar to change text-to-speech rate and a switch to enable
higher speech rates.
Change-Id: I75cfc2af4e293dc45c93a44e5c2af73d1dae9b7c
Noah Wang [Thu, 21 Jan 2016 04:47:21 +0000 (20:47 -0800)]
Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen.
Change-Id: Id02796ea44e48fe04351c9ea6bda66526f77a5cf
Samuel Tan [Fri, 22 Jan 2016 02:17:17 +0000 (18:17 -0800)]
Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.
BUG:
26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
Samuel Tan [Fri, 22 Jan 2016 02:12:53 +0000 (18:12 -0800)]
Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.
Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.
BUG:
26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
Samuel Tan [Thu, 21 Jan 2016 22:59:53 +0000 (14:59 -0800)]
Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.
Also:
- change the wording of the default option for
EAP CA and user certificates from "(unspecified)" to
"Please select", to make it obvious that a choice
needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.
BUG:
26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
Samuel Tan [Wed, 27 Jan 2016 22:07:51 +0000 (22:07 +0000)]
Display warning if users does not provide CA cert in EAP config
am:
03a117bcfa -s ours
* commit '
03a117bcfaf7c3628da8f2fe57d9be69056dcdf1':
Display warning if users does not provide CA cert in EAP config
Samuel Tan [Wed, 27 Jan 2016 22:04:30 +0000 (22:04 +0000)]
Add menu options for not specifying a EAP CA cert and User cert
am:
30f7b5a7cf -s ours
* commit '
30f7b5a7cfddc7bc3b0faa8aec3740f58dd514c3':
Add menu options for not specifying a EAP CA cert and User cert
Samuel Tan [Wed, 27 Jan 2016 22:01:09 +0000 (22:01 +0000)]
Disable configuring EAP-TLS without user certificate.
am:
933b6ed98f -s ours
* commit '
933b6ed98fc2209c57e067fcfec21791497f7811':
Disable configuring EAP-TLS without user certificate.
Jason Monk [Wed, 27 Jan 2016 20:34:44 +0000 (20:34 +0000)]
Merge changes Id18f3e9f,I737736d6
* changes:
Add additional fingerprints suggestion
Add wifi calling suggestion
Jason Monk [Wed, 27 Jan 2016 19:39:22 +0000 (14:39 -0500)]
Add additional fingerprints suggestion
Change-Id: Id18f3e9fffb1f9e964edb635689d3c7d410034fa
Sanket Padawe [Wed, 27 Jan 2016 18:59:45 +0000 (18:59 +0000)]
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
am:
30e812b731 -s ours
* commit '
30e812b7317d5f7e6eb6ca28c02c016e6b3cbf7e':
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Jason Monk [Wed, 27 Jan 2016 18:54:35 +0000 (13:54 -0500)]
Add wifi calling suggestion
Change-Id: I737736d675fe0a4606ff1ccfd7d4ec6b69e1fd73
Noah Wang [Wed, 27 Jan 2016 18:49:02 +0000 (18:49 +0000)]
Merge "Reflect settings change right after interaction"
Udam Saini [Wed, 27 Jan 2016 18:08:48 +0000 (18:08 +0000)]
Merge "Adds screen lock as a suggested activity"
Tony Mak [Wed, 27 Jan 2016 17:17:44 +0000 (17:17 +0000)]
Merge "Default apps setting for managed profile"
Jason Monk [Wed, 27 Jan 2016 16:33:34 +0000 (11:33 -0500)]
Fix multi-sim cell data pref ?
Bug:
26795856
Change-Id: I82e18c21d819d51712a65ccc37e4e3af9a006771
Geoff Mendal [Wed, 27 Jan 2016 16:26:06 +0000 (16:26 +0000)]
Import translations. DO NOT MERGE am:
963c4b3d41 -s ours am:
495ba780b9 -s ours
am:
a43de57411 -s ours
* commit '
a43de574118046520a71afc4ad14c524611ec4c0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:25:57 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am:
9c57679b0e -s ours
am:
ec30b691de -s ours
* commit '
ec30b691de360ebc0030e799dd5f42ed90720ada':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:24:10 +0000 (16:24 +0000)]
Import translations. DO NOT MERGE am:
963c4b3d41 -s ours
am:
495ba780b9 -s ours
* commit '
495ba780b98bc1333e613d96721355aa1003913b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:24:00 +0000 (16:24 +0000)]
Import translations. DO NOT MERGE
am:
9c57679b0e -s ours
* commit '
9c57679b0e06d9976bb4c72d442b3412d9220c43':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Jan 2016 16:22:12 +0000 (16:22 +0000)]
Import translations. DO NOT MERGE
am:
963c4b3d41 -s ours
* commit '
963c4b3d41c872404e84d469b213cd5a84d6d3ec':
Import translations. DO NOT MERGE
Chris Wren [Tue, 26 Jan 2016 23:04:01 +0000 (18:04 -0500)]
port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
Geoff Mendal [Wed, 27 Jan 2016 15:34:25 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I528d633660acacb4ed8a3f1d6bf2b35b3ce3170d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Jan 2016 15:25:34 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 27 Jan 2016 15:15:29 +0000 (15:15 +0000)]
Merge "Made changes to menu items in WifiSettings and AccountSyncSettings."
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
Sudheer Shanka [Wed, 27 Jan 2016 14:08:44 +0000 (14:08 +0000)]
Made changes to menu items in WifiSettings and AccountSyncSettings.
When the admin has set disallow_config_wifi, menu items are not added.
we need to check if the menu items can be added after this fragment is
resumed. And for remove account menuitem, check whether any admin has
disabled management of a specific account type.
Change-Id: I58f5a59fe0614c9bc7068b15f43f89527939359d
Tony Mak [Wed, 27 Jan 2016 14:01:16 +0000 (14:01 +0000)]
Default apps setting for managed profile
1. Print settings already support managed profile. Follow the UI of that.
ProfileSettingsPreferenceFragment is created to act as the base class
for per-profile setting.
2. Only show browser and dialer default setting in managed profile.
BUG=
26707733
Change-Id: I20d00203e14db58ec03638f692dd83a1bd50c59c
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"
Samuel Tan [Fri, 22 Jan 2016 02:17:17 +0000 (18:17 -0800)]
Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.
BUG:
26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
Samuel Tan [Fri, 22 Jan 2016 02:12:53 +0000 (18:12 -0800)]
Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.
Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.
BUG:
26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
Samuel Tan [Thu, 21 Jan 2016 22:59:53 +0000 (14:59 -0800)]
Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.
Also:
- change the wording of the default option for
EAP CA and user certificates from "(unspecified)" to
"Please select", to make it obvious that a choice
needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.
BUG:
26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
Udam Saini [Mon, 25 Jan 2016 19:22:33 +0000 (11:22 -0800)]
Adds screen lock as a suggested activity
Also, fixes a bug where the suggested activity stayed on screen
after the component was disabled causing a crash.
bug:
25246207
bug:
26770556
Change-Id: I28d784cdc57e464e49887483690ab514ca3bc46a
Sanket Padawe [Fri, 14 Aug 2015 22:49:02 +0000 (15:49 -0700)]
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug:
15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
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
Adam Lesinski [Tue, 26 Jan 2016 23:01:39 +0000 (15:01 -0800)]
Update FakeUid to match new methods in BatteryStats.Uid interface
Change-Id: I7574acbc11c93d93c965e4af80835a0dc59dc360
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"
Noah Wang [Tue, 26 Jan 2016 06:32:00 +0000 (22:32 -0800)]
Reflect settings change right after interaction
Change-Id: I3e15925e19f65c6de62a844fb51b242d71bb4d4e
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."