OSDN Git Service
Gustav Sennton [Mon, 15 Feb 2016 14:23:22 +0000 (14:23 +0000)]
Don't show disabled packages in the WebView implementation Dev setting.
You can't choose to use a disabled WebView package as WebView
implementation (this ensures that without interference from the user the
system will always try choose a package which will eventually become
updated, rather than a package that does not receive updates) and there
are cases where a package cannot/should not be enabled (to save e.g.
bandwidth).
Therefore, with this change we no longer show disabled WebView packages
as potential WebView implementations in the WebView implementation
Developer setting.
Bug:
27188851
Change-Id: I19a9b16118703d8a54d8215c186fc99ffefc4b6d
Svetoslav [Sun, 14 Feb 2016 22:50:34 +0000 (22:50 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state am:
2c02228ad0 am:
5527ac9cf2
am:
59495dd42a -s ours
* commit '
59495dd42a7d613b67af0b579c70b90368e9ce9f':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Sun, 14 Feb 2016 22:38:52 +0000 (22:38 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state am:
2c02228ad0
am:
5527ac9cf2
* commit '
5527ac9cf215fb894153bae8c3bb06fb5264d146':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Sun, 14 Feb 2016 22:28:25 +0000 (22:28 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
2c02228ad0
* commit '
2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
Jason Monk [Fri, 12 Feb 2016 21:31:43 +0000 (16:31 -0500)]
Fix incorrectly sized app prefs
Bug:
27066871
Change-Id: I0a1a4847532243c27ec5f9d96d8079c417bae91e
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit
119d589ea5aa9c2ccc5164279d718a20d0865f20)
Udam Saini [Thu, 11 Feb 2016 23:32:16 +0000 (23:32 +0000)]
Merge "Revert "Use SetupWizardPreferenceLayout"" into nyc-dev
Udam Saini [Thu, 11 Feb 2016 23:16:27 +0000 (23:16 +0000)]
Revert "Use SetupWizardPreferenceLayout"
This reverts commit
a95e7c3c09d8939c77c50450d8aaf23e9915a793.
This causes a bug where you cannot access fingerprint from settings.
bug:
27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e
Makoto Onuki [Thu, 11 Feb 2016 19:42:56 +0000 (19:42 +0000)]
Merge "Use DPM.uninstallPackageWithActiveAdmins()" into nyc-dev
shwetachahar [Mon, 8 Feb 2016 12:00:35 +0000 (12:00 +0000)]
Remove 'Higher speech rate' button based on the results of the speech
rate slider a11y UX study.
Also, group speech rate, sample sentence synthesis and default language
status into a single preference category as they all fall under the
general TTS settings category.
Bug:
24527715
Change-Id: If7253e2e8a468393afcb4c24f5a775cb9af79db9
Sudheer Shanka [Thu, 11 Feb 2016 14:21:05 +0000 (14:21 +0000)]
Merge "Disable clear credential option when disallowed by admin." into nyc-dev
Maurice Lam [Thu, 11 Feb 2016 01:07:24 +0000 (01:07 +0000)]
Merge "Use SetupWizardPreferenceLayout" into nyc-dev
Udam Saini [Thu, 11 Feb 2016 00:36:13 +0000 (00:36 +0000)]
Merge "Fixes stack overflow on some settings preferences" into nyc-dev
Udam Saini [Thu, 11 Feb 2016 00:07:41 +0000 (16:07 -0800)]
Fixes stack overflow on some settings preferences
bug:
27130222
Change-Id: If273720591ca9a4d10143b36b63eb839e4fa0a4a
Maurice Lam [Tue, 9 Feb 2016 05:20:50 +0000 (21:20 -0800)]
Use SetupWizardPreferenceLayout
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.
Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1
Makoto Onuki [Thu, 11 Feb 2016 00:21:18 +0000 (16:21 -0800)]
Use DPM.uninstallPackageWithActiveAdmins()
... so that uninstall won't fail even if the package has
other active admins.
It's pretty much an edge case, so we don't show the
deactivation confirmation in this case.
Bug
27107878
Change-Id: I7e8b0843ac6e39e3db3bfc643eed6940e8577417
Makoto Onuki [Wed, 10 Feb 2016 00:31:00 +0000 (16:31 -0800)]
Device Admin activation screen: Show buttons vertically.
Bug
25392386
Change-Id: Ie7e7ff107af3c307d99818b4c9a5e1b95fa329f2
Suprabh Shukla [Wed, 10 Feb 2016 22:58:29 +0000 (22:58 +0000)]
Merge "Adding an easy uninstall for active device admin" into nyc-dev
Suprabh Shukla [Wed, 27 Jan 2016 21:00:10 +0000 (13:00 -0800)]
Adding an easy uninstall for active device admin
Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.
Bug: b/
22359208
cherry pick of I8b955305927751185a4c982dadb5b1b6b07efe5e
Change-Id: Ib2ab0e35b74fc8dba7168174b2bc8fd383fe94fe
Mihai Nita [Fri, 5 Feb 2016 19:55:45 +0000 (11:55 -0800)]
UX fixes for the language draggable cell
This should bring things closer to the recommended UX guidelines.
It changes the way the checkbox / label play together,
and changes the "localization missing" warning icon to a string.
Also some cleanup of hard-coded styles and sizes.
Bug:
26758865
Bug:
26707846
Change-Id: I07a78a1e4a41122b91e895e363a217d3e9cacd40
Udam Saini [Wed, 10 Feb 2016 21:36:55 +0000 (21:36 +0000)]
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
Sudheer Shanka [Wed, 10 Feb 2016 21:35:54 +0000 (21:35 +0000)]
Disable clear credential option when disallowed by admin.
Bug:
27119114
Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367
mariagpuyol [Wed, 10 Feb 2016 19:11:59 +0000 (11:11 -0800)]
Modify emergency info subtitle
Change-Id: Iaa2ba23a1c0a74552e0f9b71d1e45711126a711c
Udam Saini [Wed, 10 Feb 2016 19:22:32 +0000 (11:22 -0800)]
Fixes showing learn more screen from fingerprint intro page
bug:
27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f
Anna Galusza [Wed, 10 Feb 2016 17:59:08 +0000 (17:59 +0000)]
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
Jason Monk [Wed, 10 Feb 2016 17:57:28 +0000 (17:57 +0000)]
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
Jason Monk [Wed, 10 Feb 2016 17:55:37 +0000 (12:55 -0500)]
Fix activity weirdness by doing the right thing
Bug:
27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
Udam Saini [Wed, 10 Feb 2016 17:54:58 +0000 (17:54 +0000)]
Merge "Reworks lock screen flows." into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 16:43:32 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Wed, 10 Feb 2016 15:48:36 +0000 (07:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
Geoff Mendal [Wed, 10 Feb 2016 15:43:33 +0000 (15:43 +0000)]
Import translations. DO NOT MERGE
am:
a27cd9d033 -s ours
* commit '
a27cd9d033b557d3ff791260eb51f090d8370218':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Feb 2016 15:23:28 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
Jeremy Klein [Wed, 10 Feb 2016 02:40:04 +0000 (02:40 +0000)]
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
Andre Eisenbach [Mon, 8 Feb 2016 23:40:23 +0000 (15:40 -0800)]
Add Developer menu entry to disable Bluetooth absolute volume
NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .
Bug:
27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
Jeremy Klein [Tue, 9 Feb 2016 21:11:25 +0000 (13:11 -0800)]
Remove PM query for silent provisioning BroadcastReceiver.
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit
f19aa5574b3ee89e9e7c38c6a2d8a625e3c7811e)
Jim Miller [Tue, 9 Feb 2016 23:15:32 +0000 (15:15 -0800)]
Fix crash in Settings on devices without fingerprint.
Fixes bug
27060816
Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd
Udam Saini [Thu, 4 Feb 2016 01:31:11 +0000 (17:31 -0800)]
Reworks lock screen flows.
This also adds frp warning dialogs in case the user skips lock
screen setup initially.
bug:
26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
Udam Saini [Tue, 9 Feb 2016 18:47:13 +0000 (18:47 +0000)]
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
Udam Saini [Tue, 9 Feb 2016 18:32:56 +0000 (10:32 -0800)]
Adds the headers for choose lock generic inside onCreate
This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.
bug:
26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c
Samuel Tan [Tue, 9 Feb 2016 18:24:20 +0000 (18:24 +0000)]
Allow trusted system certificates to be used in EAP network configs
am:
2b16cd3920
* commit '
2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
Allow trusted system certificates to be used in EAP network configs
Anna Galusza [Sat, 6 Feb 2016 01:52:49 +0000 (17:52 -0800)]
Change style of Preview screens (dark borders with "preview" on the bottom).
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
(cherry picked from commit
206a8457102c1a442b95609137998d32cc637974)
Tony Mantler [Mon, 8 Feb 2016 22:05:07 +0000 (22:05 +0000)]
Merge "Fix security level display" into nyc-dev
Tony Mantler [Mon, 8 Feb 2016 22:02:05 +0000 (14:02 -0800)]
Fix security level display
b/
26979319
Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d
Anna Galusza [Mon, 8 Feb 2016 17:57:24 +0000 (09:57 -0800)]
Update strings for A11y SUW.
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
Jim Miller [Mon, 8 Feb 2016 20:29:25 +0000 (12:29 -0800)]
Fix crash in ConfirmCredentials due to missing fp service.
Fixes bug
27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit
0918e5d650119aed5221b8ed3ac378f273216b45)
Geoff Mendal [Mon, 8 Feb 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 16:55:50 +0000 (17:55 +0100)]
Import translations. DO NOT MERGE
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
Samuel Tan [Tue, 2 Feb 2016 23:54:37 +0000 (15:54 -0800)]
Allow trusted system certificates to be used in EAP network configs
Add an option to the "CA certificate" field of the EAP network
configuration menu, "Use system certificates". Choosing this option
will cause the trusted, pre-installed, system CA certificates
to be used to validate EAP servers during the authentication process.
This only applies to EAP-TLS, EAP-TTLS, and EAP-PEAP network
configurations, where the CA certificate option is available.
If the user selects "Use system certificates" and leaves the
"Domain" field empty, display a warning and prevent the
EAP network configuration from being saved. Such a configuration
would be insecure--the user should constrain the domain that
the system certificates can be used to validate.
BUG:
26879191
TEST: 1) Set up AP connected to test RADIUS server.
TEST: 2) Generate a self-signed cert (Cert 1)
TEST: 3) Use Cert 1 to sign another cert (Cert 2) with common name
"sub1.sub2.domain.com"
TEST: 4) Setup RADIUS server, and configure it to present Cert 2 to EAP peer.
TEST: 5) Build angler image with Cert 1 installed in
/system/etc/security/cacerts/
TEST: 6) Set up an AP connected to the RADIUS server to broadcast
a WPA-Enterprise network.
TEST: 7) On Angler, connect to this WPA-Enterprise network with settings:
Network name: (AP SSID)
Security: 802.1x EAP
EAP method: TLS
CA certificate: Use system certificates
Domain: domain.com
User certificate: (test certificate from RADIUS setup)
Identity: (identity used for RADIUS setup)
TEST: 8) Verify that we connect successfully to the AP.
TEST: 9) Verify that connection still succeeds if Domain is set to
"sub2.domain.com" and "sub1.sub2.domain.com".
TEST: 10) Verify that connection fails if Domain is set to
"sub0.sub1.domain.com" and "otherdomain.com".
TEST: 11) Verify that network configuration cannot be saved, and an
warning message "Must specify a domain" is displayed if Domain
is left blank in the configuration in step 7
TEST: 12) Verify that the "Do not validate" option still appears in the
CA certificate dropdown menu.
Change-Id: I346d4d301305719033b84ec4599bf3d57d9d4ee5
Julia Reynolds [Fri, 5 Feb 2016 20:26:24 +0000 (15:26 -0500)]
Update DND visual interruption choices.
Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c
Clara Bayarri [Fri, 5 Feb 2016 17:37:02 +0000 (17:37 +0000)]
Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments
Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.
Bug:
26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419
Clara Bayarri [Fri, 5 Feb 2016 17:17:19 +0000 (17:17 +0000)]
Do not unify locks when Work lock is set to None
Bug:
26845805,
26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
Adam Lesinski [Sat, 6 Feb 2016 00:52:39 +0000 (00:52 +0000)]
Merge "Update FakeUid interface to match BatteryStats.Uid"
Alan Viverette [Fri, 5 Feb 2016 21:28:58 +0000 (21:28 +0000)]
Merge "Reject all touch events in TouchBlockingFrameLayout"
Alan Viverette [Fri, 5 Feb 2016 21:13:27 +0000 (16:13 -0500)]
Reject all touch events in TouchBlockingFrameLayout
Bug:
27042494
Change-Id: Ie1400f4c47d812b1f664abc955ee3dfdd03fa4a5
Samuel Tan [Fri, 5 Feb 2016 20:58:15 +0000 (20:58 +0000)]
Correctly load saved EAP CA cert and user cert options
am:
3d8cdb10f6
* commit '
3d8cdb10f6103a794e4cb68adb5de03a325d1c8f':
Correctly load saved EAP CA cert and user cert options
Jeremy Klein [Fri, 5 Feb 2016 18:15:29 +0000 (18:15 +0000)]
Merge "Remove TetherUtil functions which are no longer needed."
Jeremy Klein [Fri, 5 Feb 2016 18:14:50 +0000 (18:14 +0000)]
Merge "Make TetherSettings use the new tether api."
Julia Reynolds [Fri, 5 Feb 2016 16:11:56 +0000 (16:11 +0000)]
Merge "Remove bad activity filter."
Andrei Stingaceanu [Mon, 1 Feb 2016 15:40:53 +0000 (15:40 +0000)]
Restrict notification preferences for suspended apps
Bug:
26856390
Bug:
22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c
Julia Reynolds [Fri, 5 Feb 2016 14:37:52 +0000 (09:37 -0500)]
Remove bad activity filter.
Bug:
26982026
Change-Id: I662af8db38f4ac624ba4bd1128e7b3a1123d9f8b
Jeremy Klein [Fri, 29 Jan 2016 20:46:42 +0000 (12:46 -0800)]
Remove TetherUtil functions which are no longer needed.
Change-Id: I8559a2aaffa44e165d4e5e9070a85f23ed02b58b
Jeremy Klein [Mon, 25 Jan 2016 22:43:49 +0000 (14:43 -0800)]
Make TetherSettings use the new tether api.
The new API handles all the provisioning logic so this area can
get significant code cleanup.
Change-Id: I4bcffb14b3ce26a01d17ec149599d63b0b4392f1
Jim Miller [Fri, 5 Feb 2016 01:41:00 +0000 (01:41 +0000)]
Merge "Fix crash on devices without fingerprint feature."
Roozbeh Pournader [Fri, 5 Feb 2016 01:39:00 +0000 (01:39 +0000)]
Merge "Replace LocaleList#getPrimary() with get(0)"
Jim Miller [Fri, 5 Feb 2016 01:10:44 +0000 (17:10 -0800)]
Fix crash on devices without fingerprint feature.
Fixes bug
26877020
Change-Id: Ibee4d956beb0ce9af35f01857370c1378ef5594a
Roozbeh Pournader [Thu, 4 Feb 2016 23:55:41 +0000 (15:55 -0800)]
Replace LocaleList#getPrimary() with get(0)
getPrimary() is removed from the API due to potential confusion about
what it means.
Bug:
26984092
Change-Id: If218de84251461016f4ac06aa9a1cb8610b90d39
Jason Monk [Thu, 4 Feb 2016 23:00:20 +0000 (23:00 +0000)]
Merge "Move most settings icons to vector"
Jason Monk [Thu, 4 Feb 2016 22:56:26 +0000 (17:56 -0500)]
Move most settings icons to vector
Change-Id: I04f3f0ed75f2a17942e8571393e3cceb0d2bd7ed
Mihai Niță [Thu, 4 Feb 2016 22:20:18 +0000 (22:20 +0000)]
Merge "Locale list: format the numbers using the UI locale"
Mihai Nita [Tue, 2 Feb 2016 16:15:03 +0000 (08:15 -0800)]
Locale list: format the numbers using the UI locale
The digits used for numbering the drag-and-drop locale list should
use a locale-aware formatter.
We will not see decimal or thousand separators, but the visible
difference is in the use of native digits. Example: Arabic.
Change-Id: I3f8cd5a3adea1cb88ae63f09711c728f4588020c
Jason Monk [Thu, 4 Feb 2016 20:54:02 +0000 (20:54 +0000)]
Merge "Add animation for condition card height change."
Jason Monk [Thu, 4 Feb 2016 20:29:59 +0000 (15:29 -0500)]
Add animation for condition card height change.
Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
Jason Monk [Thu, 4 Feb 2016 19:47:43 +0000 (19:47 +0000)]
Merge "Settings Visuals"
Jason Monk [Thu, 4 Feb 2016 19:35:49 +0000 (14:35 -0500)]
Settings Visuals
Update the layouts to be more final, and support tablets better.
Move about to always be last.
Always see everything.
Change-Id: I4b804c9bfcd4d3b7f978a2617d5c2c2b1cdfa6e4
Casey Burkhardt [Thu, 4 Feb 2016 19:35:53 +0000 (19:35 +0000)]
Merge "Remove ActivityManagerNative dependency for adjusting font scale"
Sudheer Shanka [Thu, 4 Feb 2016 19:14:16 +0000 (19:14 +0000)]
Merge "Use the correct userId when checking if disabled by admin."
Alan Viverette [Thu, 4 Feb 2016 16:42:48 +0000 (11:42 -0500)]
Fix build
Change-Id: Ib87ddd906cc833cc442d8bd168388af0c2fbf8d0
Alan Viverette [Thu, 4 Feb 2016 16:07:42 +0000 (16:07 +0000)]
Merge "App grid preview for screen zoom"
Alan Viverette [Thu, 4 Feb 2016 15:12:05 +0000 (10:12 -0500)]
App grid preview for screen zoom
Change-Id: I718468dc03800d125eea1c57c8e5dfbc84aa3367
Jason Monk [Wed, 3 Feb 2016 22:05:57 +0000 (22:05 +0000)]
Merge "Make cell data usage an array"
Anna Galusza [Wed, 3 Feb 2016 21:40:08 +0000 (21:40 +0000)]
Merge "UI fixes (back arrow, blue switch bar, append whether Talkback is on to summary), Talkback no longer disabled when preference is tapped, fixes SettingsPreferenceFragment to not check parent class to determine whether to show options menu."
Sunny Goyal [Wed, 3 Feb 2016 21:35:20 +0000 (21:35 +0000)]
Merge "Adding fast scroller in app list"
Samuel Tan [Wed, 3 Feb 2016 21:21:57 +0000 (13:21 -0800)]
Correctly load saved EAP CA cert and user cert options
Previously, we did not properly load the "Do not validate"
and "Do not provide" options for the CA certificate and
User certificate EAP network configuration fields respectively
when the user previously selected these options and saved the
configuration.
Fix this by properly checking the saved CA certificate and user
certificate aliases in the saved enterprise config.
BUG:
26686071
Change-Id: If180c611f7210718cfb11c0578545b6f027827b5
TEST: Saved EAP network with the abovementioned options.
TEST: Long-pressed saved network on Wifi menu and selected "Modify Network"
TEST: "Do not validate" and "Do not provide" options are re-loaded.
Jason Monk [Wed, 3 Feb 2016 19:11:52 +0000 (19:11 +0000)]
Merge "String refinements touch -> tap"
Jason Monk [Wed, 3 Feb 2016 18:55:48 +0000 (18:55 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am:
8cb4301b59
am:
bf942b7e11
* commit '
bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:53:44 +0000 (18:53 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
am:
8cb4301b59
* commit '
8cb4301b59f95bff09526c32b30ecde396e164f7':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
Jason Monk [Wed, 3 Feb 2016 18:48:27 +0000 (18:48 +0000)]
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
Jason Monk [Wed, 3 Feb 2016 18:31:38 +0000 (13:31 -0500)]
String refinements touch -> tap
Bug:
26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
Jason Monk [Wed, 3 Feb 2016 18:13:15 +0000 (13:13 -0500)]
Make cell data usage an array
Change-Id: I39ad23882ec30c733281f87ce3c8056bc8ef4bde
Jason Monk [Wed, 3 Feb 2016 18:09:41 +0000 (18:09 +0000)]
Merge "Broadscale logging for Settings"
Udam Saini [Wed, 3 Feb 2016 17:54:16 +0000 (17:54 +0000)]
Merge "Start redaction activity after we finish current activity."
Geoff Mendal [Wed, 3 Feb 2016 17:19:25 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours am:
3abb7c0351 -s ours
am:
4de59d3cdf -s ours
* commit '
4de59d3cdfe375dc3f84a9e83e2130b494682031':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 17:19:05 +0000 (17:19 +0000)]
Import translations. DO NOT MERGE am:
dd33e41c5a -s ours
am:
2e3f763b9c -s ours
* commit '
2e3f763b9c715baa0610c8d5d52d1cfa4f72fb2c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:57:07 +0000 (16:57 +0000)]
Import translations. DO NOT MERGE am:
10a758b8b7 -s ours
am:
3abb7c0351 -s ours
* commit '
3abb7c035126e7150d90c45c18c155547b3e2a66':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:45:28 +0000 (16:45 +0000)]
Import translations. DO NOT MERGE
am:
dd33e41c5a -s ours
* commit '
dd33e41c5a722548027919efdb70b282505e328a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 16:36:53 +0000 (16:36 +0000)]
Import translations. DO NOT MERGE
am:
10a758b8b7 -s ours
* commit '
10a758b8b7869726a70b2d8fa01221ade1e48181':
Import translations. DO NOT MERGE
Oleksandr Peletskyi [Wed, 3 Feb 2016 15:45:09 +0000 (15:45 +0000)]
Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG:
24890474"
Geoff Mendal [Wed, 3 Feb 2016 15:43:34 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic601f7d4be7b8329b5092836469cfaf352d3ac45
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 15:34:47 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3d3c5d3b41843dab533b33325e67de3de8a88440
Auto-generated-cl: translation import
Sudheer Shanka [Wed, 3 Feb 2016 15:31:57 +0000 (15:31 +0000)]
Merge "Add padlocks to more preferences that can be disabled by admin."