OSDN Git Service
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
Maria Garcia Puyol [Tue, 26 Jan 2016 19:00:51 +0000 (19:00 +0000)]
Merge "Add Emergency Info preference to user settings"
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 [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
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
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
Steve Pfetsch [Fri, 22 Jan 2016 22:21:34 +0000 (22:21 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
am:
76b29667df
* commit '
76b29667dff7b27151e450a05838913971f93c8f':
Added toast message to color temperature setting
Steve Pfetsch [Fri, 22 Jan 2016 22:07:54 +0000 (22:07 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
Oleksandr Peletskyi [Fri, 22 Jan 2016 20:31:41 +0000 (20:31 +0000)]
Merge "Added check of the restriction if a user is allowed to change their icon. BUG:
25305966"
Jason Monk [Fri, 22 Jan 2016 20:20:20 +0000 (15:20 -0500)]
Only show settings drawer on top level items
Bug:
26080590
Change-Id: Id5047ef89832eb455719cd57b0e853a97d538a69
Abodunrinwa Toki [Wed, 20 Jan 2016 18:43:20 +0000 (18:43 +0000)]
Change Input Settings UI flow.
1. Introduces new UI components as per the new flow
2. Temporarily disables components in the old flow that are to be
replaced by the new flow. This is done so we can neatly revert
to the old flow if there are issues with the new flow
3. AvailableVirtualKeyboardActivity now responds to
android.settings.INPUT_METHOD_SETTINGS intents instead of
InputMethodAndLanguageSettingsActivity
Bug:
25752812
Change-Id: I728d7ee185827ed328c16cb7abce244557a26518
Anna Galusza [Fri, 22 Jan 2016 17:56:19 +0000 (17:56 +0000)]
Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies."
Robin Lee [Fri, 22 Jan 2016 17:46:02 +0000 (17:46 +0000)]
Merge "Convert credential view to DialogFragment"
Robin Lee [Tue, 19 Jan 2016 11:42:57 +0000 (11:42 +0000)]
Convert credential view to DialogFragment
Bug:
26352310
Change-Id: Ic6af37c893eec5a83e198b9f23ebd766e88e0109
Maurice Lam [Fri, 22 Jan 2016 17:17:38 +0000 (17:17 +0000)]
Merge "Use RestrictedRadioButton in SetupRedactionInterstitial"
Benjamin Franz [Mon, 18 Jan 2016 17:31:26 +0000 (17:31 +0000)]
Read work challenge background color from device policy
Call into DevicePolicyManager to retrieve the background color that
should be used for the work challenge on the user whose credential
screen we're about to show.
Change-Id: I612dd96020ce8932b49b21e6ff6faaddd39f957d
Benjamin Franz [Fri, 22 Jan 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Add background image for work challenge"
Oleksandr Peletskyi [Mon, 18 Jan 2016 14:37:04 +0000 (15:37 +0100)]
Added check of the restriction if a user is allowed to change their icon.
BUG:
25305966
Change-Id: I35fda2e4f157463d69a109409c3f8767d54eab4a
Kenny Root [Fri, 22 Jan 2016 03:30:35 +0000 (19:30 -0800)]
resolve merge conflicts of
bdc6074276 to master.
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
Maurice Lam [Fri, 22 Jan 2016 02:09:43 +0000 (18:09 -0800)]
Use RestrictedRadioButton in SetupRedactionInterstitial
Bug:
26704975
Change-Id: I857dc0e57d1aaada06be4945b0e377291864ea89
Kenny Root [Thu, 21 Jan 2016 22:12:38 +0000 (22:12 +0000)]
Merge "Stop using AlgNameMapper"
am:
8646736618
* commit '
86467366183e7b7ca006456474cca50332213ca5':
Stop using AlgNameMapper
Kenny Root [Thu, 21 Jan 2016 21:53:11 +0000 (21:53 +0000)]
Merge "Stop using AlgNameMapper"
Jason Monk [Thu, 21 Jan 2016 19:15:46 +0000 (14:15 -0500)]
Fix build.
Change-Id: I43201fc9bb989d3f490ba26cb93956878745e366
Sudheer Shanka [Thu, 21 Jan 2016 19:07:02 +0000 (19:07 +0000)]
Merge "Add padlocks to preferences that can be disabled by policy."
Sudheer Shanka [Thu, 21 Jan 2016 18:46:17 +0000 (18:46 +0000)]
Merge "Add padlock to usb modes when disabled by admin."
Steve Pfetsch [Thu, 21 Jan 2016 01:48:13 +0000 (17:48 -0800)]
Added toast message to color temperature setting
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.
Bug:
26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
Sudheer Shanka [Wed, 20 Jan 2016 20:55:39 +0000 (20:55 +0000)]
Add padlock to usb modes when disabled by admin.
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
Clara Bayarri [Thu, 21 Jan 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Fix bugs around unification when no password is set"
Philip P. Moltmann [Thu, 14 Jan 2016 23:35:06 +0000 (15:35 -0800)]
Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly.
Change-Id: If22acfee7c6a7c21803fe79ff04f33181dd10167
Andres Morales [Wed, 13 Jan 2016 23:28:54 +0000 (15:28 -0800)]
Track ro.flash.locked bit to enable/disable OEM unlocking pref
if the device is OEM unlocked already, disable the OEM
unlocking pref. If it's locked, enable.
Bug:
26039090
Change-Id: I915f3cf57deef8f5775d466dec59c891c1546b1b
Clara Bayarri [Wed, 20 Jan 2016 15:39:59 +0000 (15:39 +0000)]
Fix bugs around unification when no password is set
- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type
Bug:
26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
Jason Monk [Thu, 21 Jan 2016 14:43:35 +0000 (09:43 -0500)]
Protect against missing subscriptions
Bug:
26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
Benjamin Franz [Wed, 13 Jan 2016 12:16:25 +0000 (12:16 +0000)]
Add background image for work challenge
If the challenge shown is for a work profile, add the default image and
color to the background of the fragment.
Change-Id: I148c6cd3a835a84c7bac78b020839dfdae4a6c36
Benjamin Franz [Thu, 21 Jan 2016 12:27:36 +0000 (12:27 +0000)]
Change build targets for settings tests
1. Split existing tests into fully automatable (unit/) and not fully
automatable (app/)
2. Revert previous changes to test runners on app/
3. Fix some typos in readme
This will enable us to add the fully automatable test target
SettingsUnitTests to the continuous integration tests on the platform.
Change-Id: I0f42c59fde84891e4bfc379150c2f0c61ce1329f
Benjamin Franz [Thu, 21 Jan 2016 10:43:30 +0000 (10:43 +0000)]
Merge "Add unit tests to Utils"
Adam Lesinski [Thu, 21 Jan 2016 02:22:05 +0000 (02:22 +0000)]
Merge "Add bt traffic accounting"
Kenny Root [Wed, 20 Jan 2016 23:50:55 +0000 (15:50 -0800)]
Stop using AlgNameMapper
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.
Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
Anna Galusza [Fri, 8 Jan 2016 22:37:16 +0000 (14:37 -0800)]
Make A11y SUW launchable from SUW and small UX changes based on last round of
UX studies.
Change-Id: I9c20cd3abf910a37731da2af604f3af2cd30e942
Sudheer Shanka [Wed, 20 Jan 2016 21:10:04 +0000 (21:10 +0000)]
Merge "Add restricted padlocks to radio buttons."
Sudheer Shanka [Wed, 20 Jan 2016 21:09:27 +0000 (21:09 +0000)]
Merge "Trigger a support dialog when an action is disabled by policy"
Sudheer Shanka [Fri, 15 Jan 2016 12:20:46 +0000 (12:20 +0000)]
Trigger a support dialog when an action is disabled by policy
Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
Mihai Nita [Tue, 12 Jan 2016 16:55:05 +0000 (08:55 -0800)]
Implement multiple locales and sublocales in Settings
Does drag-and-drop reordering, supports adding / removing locales,
suggestions, search, removes locales already selected in the
user preferences.
Bug:
25800339
Change-Id: Iffe7b9810c77ec93a84d848ab20b2ba405249676
Benjamin Franz [Wed, 20 Jan 2016 12:20:15 +0000 (12:20 +0000)]
Add unit tests to Utils
1. Switch to AndroidJUnitRunner
2. Add mockito support
3. Add tests for Utils class
Change-Id: I1eabfdf1d65456d71363b8970beee9239a90ada2
Geoff Mendal [Wed, 20 Jan 2016 18:16:34 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours am:
97898c5cd2 -s ours
am:
a3bb93f1cc -s ours
* commit '
a3bb93f1ccc216159fa102ef3aca8cf7f0e22759':
Import translations. DO NOT MERGE