drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,158 Commits 1 Branch 0 Tags
Commit Graph

160158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
56bc4906d7 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 19:40:20 +00:00
Jason Monk
aed4ec4628 am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
  Ellipsize QS detail items when needed
 2015-02-05 19:40:17 +00:00
Alan Viverette
b11af58bb8 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
 2015-02-05 19:40:12 +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
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
1b8945942d am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
 2015-02-05 15:27:27 +00: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
Alan Viverette
79cc73a095 am bac8e12e: Move layer-list to be top-level element in seek bar progress 
* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 04:52:34 +00:00
Zhijun He
b9f0cae9f6 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 04:50:44 +00:00
Alan Viverette
33e7e42336 am 80252a92: Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 04:50:38 +00:00
Alan Viverette
b1613a0052 am 721a9578: Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 04:50:34 +00:00
George Mount
722491d84a am c3a043cf: Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 04:50:29 +00: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
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
49c2bc3abb am d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 
* commit 'd7310bd1499c0b48594a8fbbcbe0c7e80c1e5832':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:46:24 +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
2e6eede460 am fdb2112b: camera2: limit flexYUV array size in DngCreator 
* commit 'fdb2112bbc140aab869aac047454cd2f67809df1':
  camera2: limit flexYUV array size in DngCreator
 2015-02-03 23:18:34 +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
8ad51b5672 am 39ae0547: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 
* commit '39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:13:41 +00: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
f855a3ce17 am ded133c4: Fix broken activation of the selected view in accessibility mode. 
* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 12:11:48 +00: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
be876df1d8 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
  docs: February 2015 Dashboard updates
 2015-02-02 19:31:36 +00:00
Jorim Jaggi
15b7627b14 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:36 +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
c1c9c3199e am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 15:56:16 +00: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
cd97a641eb am dcce25a9: 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 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
 2015-01-31 08:04:42 +00:00
Joe Fernandez
d58870e0a9 am 346a9a2f: am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da 
* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
 2015-01-31 08:04:38 +00:00
Deepanshu Gupta
2a051ef9f6 am 580937fc: am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 
* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
 2015-01-31 08:04:34 +00:00
Deepanshu Gupta
da30fd779a am 1575ca6e: am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd 
* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
 2015-01-31 08:04:30 +00:00
Joe Fernandez
223e62568d am 3548de60: am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
 2015-01-31 08:04:06 +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