160052 Commits

Author SHA1 Message Date
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Chong Zhang
6cad6513e0 Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 2015-02-06 02:06:24 +00:00
Chong Zhang
6286f8ec05 reset col position to 1 on row PAC
bug: 19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
2015-02-05 16:46:06 -08:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
2015-02-05 15:58:56 -08:00
Alan Viverette
69a62a8b0d Merge "Update preference dialog padding to Material" into lmp-mr1-dev 2015-02-05 22:06:36 +00:00
Sanket Padawe
04db979728 Merge "Suppress phone number from logcat." into lmp-mr1-dev 2015-02-05 20:51:10 +00:00
John Spurlock
9adf1c5422 am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
  Fix a few typos in Parcel.java.
2015-02-05 20:39:36 +00:00
Alan Viverette
2fb5a6ab9f Update preference dialog padding to Material
Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.

Bug: 19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31
2015-02-05 12:35:07 -08:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
2015-02-05 20:27:59 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java.
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
2015-02-05 20:18:03 +00:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Kenny Guy
74a7024af0 Fix mangled javadoc for setPermittedInputMethods.
Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
2015-02-05 19:48:38 +00:00
Sanket Padawe
1acdd4b1f4 Suppress phone number from logcat.
Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
2015-02-05 11:45:27 -08:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Dianne Hackborn
5c2fdc331f Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 2015-02-05 19:26:32 +00:00
Jason Monk
3bbc5a1134 Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 2015-02-05 19:19:43 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
2015-02-05 11:11:03 -08:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText()
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
2015-02-05 09:58:49 -08:00
Jason Monk
867874b06a Ellipsize QS detail items when needed
Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
2015-02-05 11:54:58 -05:00
Kenny Guy
8d12d3da15 Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 2015-02-05 12:34:45 +00:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust.
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
2015-02-04 17:26:17 -08:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
2015-02-04 17:15:01 -08:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
2015-02-04 16:44:02 -08:00
Alan Viverette
721a95784e Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 2015-02-05 00:20:15 +00:00
George Mount
c3a043cf0e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
2015-02-04 15:27:56 -08:00
John Spurlock
e08523684d Fix a few typos in Parcel.java.
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
2015-02-04 23:18:09 +00:00
Alan Viverette
b0d672376d Replace ic_clear with vector icon
Fixes the clear icon being really tiny.

Bug: 19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab
2015-02-04 22:49:02 +00:00
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
2015-02-04 13:59:43 -08:00
Christopher Tate
c83d3e4b72 Always re-establish kernel alarms when considering new alarm set
As a backstop against missed alarm delivery / wakeups or clock slew,
make sure to always schedule a kernel alarm for the next alarm events
of interest when we've reexamined the set of deliverable alarms.

Bug 19201933

Change-Id: I3cd37a63dfb0c8258941497d4ba516ed00e2edad
2015-02-04 13:48:29 -08:00
Kenny Guy
e9acb59a91 Only switch user if current user is being wiped
Only try and switch to owner if the current user
is being removed.

Bug: 19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
2015-02-04 17:55:42 +00:00
Wonsik Kim
d7310bd149 Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 2015-02-03 23:39:59 +00:00
Lajos Molnar
fdb2112bbc camera2: limit flexYUV array size in DngCreator
corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
2015-02-03 14:57:09 -08:00
Paul Jensen
39ae0547ca Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 2015-02-03 21:08:59 +00:00
Paul Jensen
8fe1742946 Facilitate network validation on networks with a per-network PAC.
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY.  This will fail on networks where Internet
access is only permitted via the proxy.  Always failing network
validation has the potential to disable WiFi auto-join.  Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.

bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
2015-02-03 11:28:55 -05:00
Svetoslav
ded133c446 Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
2015-02-02 23:17:17 +00:00
Joe Fernandez
175ddbcf2e am d14b6432: am eba583e3: docs: February 2015 Dashboard updates
automerge: c6ca860

* commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
  docs: February 2015 Dashboard updates
2015-02-02 19:24:38 +00:00
Jorim Jaggi
515148dcaa Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 2015-02-02 19:19:24 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
2015-02-02 20:18:26 +01:00
Joe Fernandez
c6ca8600a4 am d14b6432: am eba583e3: docs: February 2015 Dashboard updates
* commit 'd14b64323ff92be9db804d66a1146693c27150a6':
  docs: February 2015 Dashboard updates
2015-02-02 17:44:26 +00:00
Joe Fernandez
d14b64323f am eba583e3: docs: February 2015 Dashboard updates
* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates
2015-02-02 17:20:35 +00:00
Joe Fernandez
eba583e393 docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
2015-02-02 08:48:42 -08:00
Tyler Gunn
4143b796bc Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 2015-02-02 15:48:53 +00:00
Jon Larimer
dcce25a9a7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a
automerge: 4a82635

* commit '4a826358e769e697ec329cf14edeb049981a11a9':
2015-01-31 05:19:19 +00:00
Jon Larimer
4a826358e7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af
automerge: 27d099a

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':
2015-01-31 05:03:24 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
2015-01-31 03:39:19 +00:00
Joe Fernandez
346a9a2f36 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9
automerge: cacf7da

* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
  docs: training intent doc error update
2015-01-31 03:04:16 +00:00