194285 Commits

Author SHA1 Message Date
Dirk Dougherty
392f532104 am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs
* commit '5c117ae1fb27a5a94dd37489cdb7b16ddc10c2bf':
  Fix dependency specs for data binding.
2015-06-02 23:41:40 +00:00
Dirk Dougherty
5c117ae1fb Merge "Fix dependency specs for data binding." into mnc-preview-docs 2015-06-02 23:29:36 +00:00
Chris Craik
53e51e4aa9 Handle shader matrix correctly when ignoring canvas transform
bug:20063841

Restores old SkShader matrix behavior from before the Glop refactor.

Many drawing operations draw without sending the canvas transform to
the GL shader. In such cases, we need to adapt the matrix sent to the
SkShader logic to invert the canvas transform that's built into
the mesh.

Change-Id: I42b6f59df36ce46436322b95bf9ad2140795ee58
2015-06-02 16:28:39 -07:00
John Reck
6058251939 Merge "More colors, now with material colors" into mnc-dev 2015-06-02 23:16:31 +00:00
John Reck
4e14da5695 Merge "FrameInfo header fixes" into mnc-dev 2015-06-02 23:16:31 +00:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
John Reck
bf3c602284 More colors, now with material colors
Bug: 18052916
Change-Id: I66c2573d796338ee7b7d0ddf240b90cc78a71ce5
2015-06-02 16:13:56 -07:00
Alan Viverette
a70d4a90a0 Prevent poorly-extended ParcelableSpans from writing to parcels
If a developer extends an existing ParcelableSpan and overwrites
writeToParcel, TextUtils will crash when attempting to unparcel
since the span type ID is not accurate. This CL makes a separate
framework-private method for writeToParcel to ensure that even if
a developer extends a ParcelableSpan class, they won't modify the
parceling or unparceling code that's tied to the span type ID.

Bug: 21274544
Change-Id: If4c3506a55999df7a3b6d87cb8d550235d7a02c6
2015-06-02 16:11:00 -07:00
Steve McKay
92dce15787 Update hamburger share, and delete icons to use the 24x MD icons.
BUG=18685222,17699796
Change-Id: I4b14b83eca7fe30e250e1252cb384bc94e05e0a4
(cherry picked from commit e07525536b7edf584ffc96ba69951794d6096b57)
2015-06-02 23:07:40 +00:00
James Cook
d8b7d2ce2d Fix TabHost stealing focus on hardware keyboard keypress
Don't try to change focus at all on exit from touch mode. The old
behavior might have been useful for very old apps with a TabHost as
their primary UI, but that's not a modern app structure.

Bug: 21417491
Change-Id: I3db2ab42c90b6c82f23216244a8183c4290eb7d7
2015-06-02 16:02:12 -07:00
John Reck
5eff54f79f Fix framestats docs ordering
Bug: 21560187

Fields were listed in a different order than they were printed

Change-Id: Icea4f442c5f43aef42e0701958249a4dca9e01f0
2015-06-02 23:01:03 +00:00
John Reck
4db3d17deb FrameInfo header fixes
Bug: 21560187

Log column names as part of output in case of other such
issues

Change-Id: I16157ed968307e761d416ca54bd7af5453fe67bf
2015-06-02 15:58:43 -07:00
Alan Viverette
d281428abd Update number picker styling for Material
Implements several missing drawable maintenance methods (state, etc.)
for NumberPicker's divider.

Bug: 21588885
Change-Id: Ibe37884354864c43fbf84d9eb79d7183af46fcad
2015-06-02 15:47:37 -07:00
Jason Monk
6ef831fe1a Merge "Tuner: Let Status bar be tuned" into mnc-dev 2015-06-02 22:39:04 +00:00
Filip Gruszczynski
93634166c8 am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.
2015-06-02 22:36:42 +00:00
Santos Cordon
239288cf19 Merge "Fix ringback return value." into mnc-dev 2015-06-02 22:28:45 +00:00
Filip Gruszczynski
d88e4d50d6 Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 2015-06-02 22:26:39 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2 Merge "Make sure starting windows only draw once" into mnc-dev 2015-06-02 22:24:48 +00:00
Arunesh Mishra
6e4fb34e27 Use config.xml parameters instead of System properties.
For 'near-ultrasound' support (mic/speaker). Refer b/21072209
for details.

Bug: 21072209
Change-Id: Id7131cd38288d74af8102487b2c6b03048b4ae3b
2015-06-02 15:13:17 -07:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Santos Cordon
15d63c718f Fix ringback return value.
Bug: 21474410
Change-Id: I6e08e89636c3b42c97fc194a314a325245755d09
2015-06-02 15:09:38 -07:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Brian Attwell
c7a4eabe98 Merge "Rename PhoneNumberUtils APIs" into mnc-dev 2015-06-02 22:02:24 +00:00
Doris Liu
942bc58518 Fix calls to Rect.intersect(Rect)
This CL checks for the return value for Rect.intersect(Rect) for whether
there is actually an intersection before taking the calling rect as the
intersection. In the case of no intersection (Rect.intersect(Rect) returns
false), the calling rect would not have been changed, so here in this CL
it will be manually set empty.

Bug: 7368679
Change-Id: I7494c1a1649eca09e34412f0a59b795e8b3a82aa
2015-06-02 15:01:48 -07:00
Chris Craik
78ab4c3867 am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs
* commit '6042f351d21a67e6ebb30d1effce8264772c6a19':
  Rework systrace analysis documentation
2015-06-02 22:01:19 +00:00
John Spurlock
023544f762 Volume footer uglification.
- Move "End now" button to its own line, below the condition lines.
 - Add the feature name "Do Not Disturb" to the condition summary
   for the indef condition.
 - Fix found RTL issues with the footer.

Bug: 21171893
Change-Id: Ia12fe57d46a5547beec82cf76e175982bfa3fd6c
2015-06-02 17:56:28 -04:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -07:00
Jeff Brown
143739cb6b Clarify docs on registerContentObserver.
Bug: 19343752
Change-Id: If241e329f73925964f5589ee72d63a1fae54ef1b
2015-06-02 14:53:39 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Chris Craik
6042f351d2 Merge "Rework systrace analysis documentation" into mnc-preview-docs 2015-06-02 21:51:31 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request.
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Alex Klyubin
0fe70813e0 Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
2015-06-02 14:38:35 -07:00
Brian Attwell
115c04410e Rename PhoneNumberUtils APIs
In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
2015-06-02 21:34:33 +00:00
Jonathan Basseri
f31ac338af Migrating MmsConfig to CarrierConfigManager.
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
2015-06-02 14:29:04 -07:00
Jun Mukai
3427f57e03 Retire PFLAG_ONLY_DRAWS_BACKGROUND.
Per discussion on another CL, this CL retires
PFLAG_ONLY_DRAWS_BACKGROUND because this is over-optimizing and
misleading.  Also setFlags() needs to care both the background
and the foreground.

Bug: 20734520
Change-Id: I57d63e776b5fbad9effd10ad87e683bbb2a6dacd
2015-06-02 14:27:35 -07:00
Yorke Lee
db6da48621 Allow default dialer changes and phone account enable/disable via ADB
Add commands accessible via adb shell that can be used for CTS tests
without the need for adb root
*set-phone-account-enabled
*set-phone-account-disabled
*set-default-dialer
*get-default-dialer

Modify enablePhoneAccount/setDefaultDialer to indicate success.

Remove now unused functionality in ProtectedEnableAccountPreferenceActivity
and ProtectedChangeDefaultDialerActivity.

Bug: 21583012
Change-Id: I542d145cc969334c004b8344fbbb01f278256f9d
2015-06-02 14:23:21 -07:00
Jonathan Basseri
abdf79aba0 Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev 2015-06-02 21:15:05 +00:00
Jonathan Basseri
27a7b78e40 Revert "Migrating MmsConfig to CarrierConfigManager."
Forgot to update-API

This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
2015-06-02 21:13:48 +00:00
Joe Fernandez
ab1fb23712 am 79106d1c: docs: Remove ADT-1 RMA form link
* commit '79106d1cdea70d80a8e75655fa94cf794d0e91e0':
  docs: Remove ADT-1 RMA form link
2015-06-02 21:09:50 +00:00
Dirk Dougherty
bcab182714 Fix dependency specs for data binding.
Change-Id: I61c52d78601b977cdb991697139fd3531d4f0285
2015-06-02 14:09:09 -07:00
Adrian Roos
579e7b7b9a Merge "Patches for IKeyguardStateCallback" into mnc-dev 2015-06-02 21:05:22 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public.
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
2015-06-02 14:04:41 -07:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
2015-06-02 20:56:27 +00:00
Adrian Roos
56dbe3ee4b Merge "Hide and disable emergency assist API" into mnc-dev 2015-06-02 20:50:55 +00:00
Andres Morales
e40bad8cf9 [LockSettings] migrate patterns to be indexed at '1'
Base zero patterns (ones where the top left is idx 0)
are not handled properly by scrypt. Add logic to re-enroll
base zero patterns such that the top left is idx 1.

Bug: 21433955
Change-Id: I7f67f2c67d40dd1be6c62117710dc3b0392275a2
2015-06-02 13:45:02 -07:00
Jonathan Basseri
ffa8f101cc Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 20:43:11 +00:00
Jason Monk
d3c2089f88 Merge "Add ability to get device by address" into mnc-dev 2015-06-02 20:41:24 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00