157881 Commits

Author SHA1 Message Date
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib"
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
2014-10-01 18:11:18 +00:00
Justin Koh
bf6f081cda am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '37185d90a2036ece55991f416fcf7948a2198d97':
  DO NOT MERGE Hide the volume panel for watches for now
2014-10-01 18:00:45 +00:00
Justin Koh
37185d90a2 Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 2014-10-01 17:58:01 +00:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:55:43 +00:00
Justin Koh
0beee08646 DO NOT MERGE Hide the volume panel for watches for now
Hide the volume panel: it's not usable. Need new design in a future release.

Bug: 17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
2014-10-01 10:55:40 -07:00
Ihab Awad
24199873ca Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 2014-10-01 17:50:49 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618)
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
2014-10-01 17:48:05 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
2014-10-01 10:38:07 -07:00
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:25:38 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
2014-10-01 10:14:53 -07:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00:00
John Spurlock
c909e1b2df Zen: Fix new event category check.
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
2014-10-01 11:17:43 -04:00
Neil Fuller
33253a4baa Switch from FloatMath -> Math and Math.hypot where possible
The motivation is an API change: FloatMath is going to be
deprecated and/or removed. Performance is not the goal of
this change.

That said...

Math is faster than FloatMath with AOT compilation.

While making the change, occurances of:

{Float}Math.sqrt(x * x + y * y) and
{Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2))

have been replaced with:

{(float)} Math.hypot(x, y)

Right now there is no runtime intrinsic for hypot so is not faster
in all cases for AOT compilation:

Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with
AOT, but all other combinations of FloatMath, use of pow() etc.
are slower than hypot().

hypot() has the advantage of being self documenting and
could be optimized in future. None of the behavior differences
around NaN and rounding appear to be important for the cases
looked at: they all assume results and arguments are in range
and usually the results are cast to float.

Different implementations measured on hammerhead / L:

AOT compiled:

[FloatMath.hypot(x, y)]
benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials

[FloatMath.sqrt(x*x + y*y)]
benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials

[FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))]
benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials

[(float) Math.hypot(x, y)]
benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials

[(float) Math.sqrt(x*x + y*y)]
benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials

[(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))]
benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials

Interpreter:

benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials
benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials
benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials
benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials
benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I06c91f682095e627cb547d60d936ef87941be692
2014-10-01 14:04:15 +01:00
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
2014-10-01 14:12:11 +02:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Baligh Uddin
42d0c353ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 04:25:43 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Ricardo Cervera
1ed09f9b5b am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit 'e906b38b7e692d05cf57ce12aabcb103a9a8b775':
  docs: ADT beginner text fix
2014-10-01 03:15:45 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
2014-10-01 02:57:29 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Sungsoo Lim
ee33c661ef Merge "Update java doc for content rating systems" into lmp-dev 2014-10-01 01:46:26 +00:00
Jerome Poichet
72079f7f9b Merge "Make sure cancel is called on tear down." into lmp-dev 2014-10-01 01:22:42 +00:00
Dianne Hackborn
62321ab114 Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 2014-10-01 01:16:15 +00:00
Dianne Hackborn
7622a0f8e4 Maybe fix issue #17700474: manta: high occurrence of device booted...
...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
  boot there was calling finishBooting() with the lock held, but it
  shouldn't.  We now dispatch that and turning on the screen together
  in a separate message.

- Make sure we don't try to start the home activity until we have
  reached the point of the system being ready and mBooting being set.
  This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
2014-09-30 18:05:18 -07:00
Jeff Brown
0a434776b8 Reduce latency from doze to screen on.
Don't wait for the brightness ramp to complete before reporting
display ready.  Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
2014-09-30 18:00:40 -07:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down.
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
2014-09-30 17:56:27 -07:00
Amit Mahajan
b3ad87e6b1 am 496aeb1a: Merge "Roaming blacklist" into lmp-dev
* commit '496aeb1a6156f3c089135a7ce4fab550589eaff7':
  Roaming blacklist
2014-10-01 00:48:50 +00:00
Adam Lesinski
d388b1fdde am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
  Fix issue with using locally defined attrs in a shared lib
2014-10-01 00:44:31 +00:00
Amit Mahajan
496aeb1a61 Merge "Roaming blacklist" into lmp-dev 2014-10-01 00:44:03 +00:00
Sungsoo Lim
d3f17921bd Update java doc for content rating systems
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.

Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
2014-10-01 09:41:51 +09:00
Adam Lesinski
cd8e73817d Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 2014-10-01 00:39:57 +00:00
w19976
a902fe5fbf Roaming blacklist
Bug: 17684236
Change-Id: I3e4a293ed8ae134d77fe3ce0c0cfa3b6012500a8
2014-10-01 00:37:19 +00:00
Alan Viverette
6a87fb2b29 am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev
* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
  Add activated text colors, update Material preference header
2014-10-01 00:36:45 +00:00
Alan Viverette
9c4b973007 am 191807e3: Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev
* commit '191807e3863d873cd315701ab7f32b0b51e1bf35':
  Remove baked-in shadow insets from Material dialog minHeight
2014-10-01 00:36:41 +00:00
Alan Viverette
c2379e005d Merge "Add activated text colors, update Material preference header" into lmp-dev 2014-10-01 00:35:02 +00:00
Alan Viverette
191807e386 Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 2014-10-01 00:32:39 +00:00
Vineeta Srivastava
044ae6938c am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev
* commit 'ab1e241d385ac2cb589f961cf6ea4a86b8a3e867':
  Show one name if both plmn and spn are equal
2014-10-01 00:11:04 +00:00
Alan Viverette
b21e5662d5 Remove baked-in shadow insets from Material dialog minHeight
We don't bake in shadows anymore, so this was making the minimum
content area way too tall.

BUG: 17700338
Change-Id: I728693654a6dc1c8d75a258746409b61639dccfc
2014-09-30 17:07:25 -07:00
Vineeta Srivastava
ab1e241d38 Merge "Show one name if both plmn and spn are equal" into lmp-dev 2014-10-01 00:03:34 +00:00
Vineeta Srivastava
feddd60827 am 575bf7e6: Merge "Correct MTU size for Bell" into lmp-dev
* commit '575bf7e6ccd3555e2f7e7b90f061867fa1a39934':
  Correct MTU size for Bell
2014-10-01 00:02:58 +00:00
Vineeta Srivastava
575bf7e6cc Merge "Correct MTU size for Bell" into lmp-dev 2014-10-01 00:00:02 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
2014-09-30 16:52:41 -07:00
Ian Rogers
b05f1dfe10 Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 2014-09-30 23:52:22 +00:00
Eino-Ville Talvala
c89f28019d am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
  Camera2 Legacy: Set a default thumbnail size
2014-09-30 23:51:26 +00:00