Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,650 Commits 3 Branches 0 Tags
7fd807d8f4eb7c2ceed072e26db77a0bceffcb26
Commit Graph

6100 Commits

Author SHA1 Message Date
Alan Viverette
05b07c56b5 am a14344de: am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 
* commit 'a14344de9b4891301fcb1a57055e20e29f25075a':
  Only request layout when removeView() actually removes a view
 2014-10-20 19:18:40 +00:00
Alan Viverette
a14344de9b am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 
* commit '49870a1b6460dc006a20fc11e1d0d67248a87be4':
  Only request layout when removeView() actually removes a view
 2014-10-20 19:13:30 +00:00
Alan Viverette
e28cd1a276 Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 2014-10-20 19:00:36 +00:00
Adrian Roos
733ad97c38 am 4e2c2988: am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 
* commit '4e2c29887616596e922e2b5fc5ac4929b3654f6c':
  Retire RecentApplicationsDialog
 2014-10-20 13:20:37 +00:00
Adrian Roos
4e2c298876 am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 
* commit '2f6fd874510cd333f7fc0b08e146d5d069fa2013':
  Retire RecentApplicationsDialog
 2014-10-20 13:15:40 +00:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Svetoslav
e7797227c4 am f4346545: am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'f43465452bb782166a4cb96dbfede9e7514787ba':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:25:25 +00:00
Svetoslav
f43465452b am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:19:57 +00:00
Svetoslav
0b5af04a8b am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:09:55 +00:00
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption. 
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
 2014-10-17 14:33:11 -07:00
Alan Viverette
177ec4608e Only request layout when removeView() actually removes a view 
BUG: 18035456
Change-Id: Iec82be63ef9fc4d0ff90d93f8f3a65328a5e1eba
 2014-10-17 13:34:50 -07:00
Alan Viverette
d50efd6214 am 69441098: am 15d3a53b: am 721fc2ad: Fix build 
* commit '694410981fc55c84f740dea41b640e2ff7f5e474':
  Fix build
 2014-10-17 19:01:47 +00:00
Alan Viverette
694410981f am 15d3a53b: am 721fc2ad: Fix build 
* commit '15d3a53be5fa856ad85d066111d27c60c885f3b2':
  Fix build
 2014-10-17 18:55:05 +00:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00
Alan Viverette
247566e3e6 am ef8a1914: am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit 'ef8a19147e086c559e5e98e9ff340532385ab556':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:32:11 +00:00
Alan Viverette
ef8a19147e am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '0087f2253ac8cbb4868fd27d71afbad32a103a75':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:27:41 +00:00
Alan Viverette
2f68a204b2 Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 2014-10-17 17:18:36 +00:00
Adam Powell
aa2e0fd9fd am c928beac: am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit 'c928beac470156dfb22a993a3a7ea0c4f3f2bd10':
  View measurement optimization
 2014-10-16 00:37:19 +00:00
Adam Powell
c928beac47 am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit 'f8c7d87a65f7a94201d7aa3c7ff3f474b83f43db':
  View measurement optimization
 2014-10-16 00:32:14 +00:00
Adam Powell
9cefbda11e View measurement optimization 
If a view hasn't explicitly requested layout and it's asked to measure
with MeasureSpec.EXACTLY in both dimensions and sizes that match its
current measured size, the measure operation is a no-op.

This helps out a number of ViewGroups that perform initial speculative
measurements with AT_MOST or UNSPECIFIED followed by looping over
child views and measuring EXACTLY to lock in the final measurement
with perhaps some extra leftover space distributed. In practice this
happens a fair bit, especially for views high up in the view
hierarchy. This optimization allows ViewGroup measurement code to be a
little cleaner in not having to keep track of this on its own.

Change-Id: I88ff46a7d37aeda7a4cd16204b68cab0d051b341
 2014-10-15 12:20:36 -07:00
Alan Viverette
96f517c1d4 am db2031e2: am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit 'db2031e215ab9aca0d41a0dd7f8f571f6bd94110':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 03:06:26 +00:00
Alan Viverette
db2031e215 am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit 'ba4bbe79c2610bd4c0525837ad6654e0e36fd32d':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 02:30:22 +00:00
Alan Viverette
6f1edae88c Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 2014-10-14 23:52:23 +00:00
Alan Viverette
99562fbbb4 Check type resolution on declared methods and fields in ViewDebug 
BUG: 17375269
Change-Id: I8a74dfab1a1cf11b4240afb011d2729beea307c5
 2014-10-14 14:48:52 -07:00
Jesse Hall
3f2c8122f0 am 3e173290: am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '3e1732907b41e69fbd6ddb13de6f47c845cb85c0':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:30:23 +00:00
Jesse Hall
3e1732907b am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit '05bbbebb475a2816d60c4a8ec140cccddc16b269':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-14 17:22:33 +00:00
Alan Viverette
be98cdc702 Send VIEW_SELECTED event when View selection state changes 
BUG: 11354667
Change-Id: I55d69e0e156c7bd83c14025f313a9d7261b7ccda
 2014-10-13 17:58:39 -07:00
Jesse Hall
8d3cf106aa am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev 
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails
 2014-10-13 22:08:31 +00:00
Jesse Hall
d7e559675c Surface: Leave object in unlocked state when unlockCanvasAndPost fails 
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
 2014-10-13 11:01:15 -07:00
Svetoslav
1f2b656371 am d7c3816f: am f874a06b: am e78aa531: am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit 'd7c3816f8415c59d34daa203f6651200cb04458e':
  Fix child view ordering for accessibility.
 2014-10-10 22:07:36 +00:00
Adam Powell
5093be6a54 am f0eba024: am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit 'f0eba02485e10d4d9a843e67a05ca345c81f0741':
  Document that MarginLayoutParams margins should be positive.
 2014-10-10 18:41:31 +00:00
Adam Powell
892a8095aa am de640f02: am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit 'de640f02108f327a9920a2c4b435a7d425c3ef78':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-10 18:41:25 +00:00
Svetoslav
d7c3816f84 am f874a06b: am e78aa531: am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit 'f874a06b952bafefb1ab2df8634b18ca30731eaf':
  Fix child view ordering for accessibility.
 2014-10-10 17:15:08 +00:00
Adam Powell
f0eba02485 am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '0f61804f18988dd547d3d56aef40a13aa59d3ce6':
  Document that MarginLayoutParams margins should be positive.
 2014-10-10 17:00:35 +00:00
Adam Powell
de640f0210 am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 
* commit '02091f071ad2b4754c9f4c7a66738d0d661c0c0e':
  Throw a more descriptive exception when adding null to a ViewGroup
 2014-10-10 17:00:30 +00:00
Dianne Hackborn
d95f1c991c am 75a6e82b: am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '75a6e82bcc625025c5f48dc6c33d0dd469e9ca61':
  Put in real "code" (aka marketing) name.
 2014-10-10 05:41:19 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Svetoslav
e78aa53123 am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev 
* commit '9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199':
  Fix child view ordering for accessibility.
 2014-10-10 00:32:15 +00:00
Svetoslav
88e447b576 Fix child view ordering for accessibility. 
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.

Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.

bug:17887986

Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
 2014-10-09 16:40:47 -07:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Adam Powell
45a9da5076 Throw a more descriptive exception when adding null to a ViewGroup 
Help developers during debugging bad calls to addView by throwing an
IllegalArgumentException earlier rather than implicitly tossing NPE
the first time the child view is accessed.

Change-Id: I4a554635815a5d0b415f637b93592fb45973f26d
 2014-10-09 09:47:03 -07:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Adrian Roos
9a64513c7f Retire RecentApplicationsDialog 
Bug: 5162991
Change-Id: I429da977502f33e2091496f3a075b2c507a88e1f
 2014-10-08 02:59:56 +02:00
Derek Sollenberger
62a93760bf Merge "Mutable Java Shaders with Immutable Native Shaders" 2014-10-07 13:34:10 +00:00
Yohei Yukawa
a1d49337fb Use try-with-resources 
We can start relying on try-with-resources in framework.

Change-Id: Iac1194022065c41e8593524e483d6076d4ea72fa
 2014-10-07 12:04:04 +09:00
Derek Sollenberger
dfba4d3d11 Mutable Java Shaders with Immutable Native Shaders 
bug: 17641888
Change-Id: I0f05387423cde185dab1a1453f89d5251ca1a4f9
 2014-10-06 13:04:45 -04:00
John Reck
6e4140c6e2 am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
  Cleanup DeferredLayerUpdater
 2014-10-04 15:45:20 +00:00
John Reck
6a2296d856 am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev 
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
  Cleanup DeferredLayerUpdater
 2014-10-03 23:57:30 +00:00