83735 Commits

Author SHA1 Message Date
Chet Haase
a7c2fcea27 am 2a17c989: am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev
* commit '2a17c989855e5f4d63b3c09176a4a7fa9a1b24da':
  Restore scissor state correctly
2012-08-15 14:44:39 -07:00
Chet Haase
2a17c98985 am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev
* commit '6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4':
  Restore scissor state correctly
2012-08-15 14:42:51 -07:00
Scott Main
02d74a28ee docs: fix markup bug; remove extra </div>
Change-Id: I9d1fd280b5f077a423f12ce8e226d09e5e9f7b2b
2012-08-15 14:42:48 -07:00
Dianne Hackborn
f3f8b8ef3f am 777e977c: am e9c2f18c: Merge "Add more debug info when a container view ID can\'t be found." into jb-mr1-dev
* commit '777e977c0f0980e4c954a5cae566cf1c33f2e6c9':
  Add more debug info when a container view ID can't be found.
2012-08-15 14:41:37 -07:00
Chet Haase
6b7d46b78c Merge "Restore scissor state correctly" into jb-mr1-dev 2012-08-15 14:40:36 -07:00
Dianne Hackborn
777e977c0f am e9c2f18c: Merge "Add more debug info when a container view ID can\'t be found." into jb-mr1-dev
* commit 'e9c2f18c8ec9c5a09fce0d48a71bb2ce93ca75c4':
  Add more debug info when a container view ID can't be found.
2012-08-15 14:39:45 -07:00
Dianne Hackborn
e9c2f18c8e Merge "Add more debug info when a container view ID can't be found." into jb-mr1-dev 2012-08-15 14:36:53 -07:00
Dianne Hackborn
5bf6e1a1db Add more debug info when a container view ID can't be found.
Change-Id: Ibb2afc49747bd2d0ac24605cb3ec390334f8abf8
2012-08-15 14:33:32 -07:00
Chet Haase
4c97064223 am e73e5d33: am 42bb0be6: Merge "Glyph cache optimization" into jb-mr1-dev
* commit 'e73e5d33a81ad2afc1f4b851b9a6d94e53ac9b87':
  Glyph cache optimization
2012-08-15 14:28:56 -07:00
Chet Haase
e73e5d33a8 am 42bb0be6: Merge "Glyph cache optimization" into jb-mr1-dev
* commit '42bb0be6c624ebf2fc0df57f148dae17601ee1de':
  Glyph cache optimization
2012-08-15 14:27:04 -07:00
Chet Haase
42bb0be6c6 Merge "Glyph cache optimization" into jb-mr1-dev 2012-08-15 14:24:50 -07:00
Chet Haase
2efd5c5886 Glyph cache optimization
Precaching at startup was not working. One-liner fix to init the caches
so that precaching would kick in earlier, saving time at startup by avoiding
the multiple-upload issue of caching at render time.

Issue #6893691 long app launch time on manta for some apps comparing to nakasi/stingray

Change-Id: Ie5c7f0536ec8ea371c7892e5e09c1db14795531c
2012-08-15 14:19:20 -07:00
Chet Haase
8025061c59 Restore scissor state correctly
Chrome is disabling the scissor, which doesn't play well with our
code that assumes that we know the state of the scissor. This fix
sets up our internal state based on the actual state of the scissor
in the resume() function (which is called after any calls out to the
Chrome or Browser GL functor). This fixes intermittent rendering
artifacts, including a gray address bar (where the gray background
gets painted without the clip that is being applied to the text foreground).

Issue #6886339 Address bar in Chrome turns gray after swiping the tabs / favicons drift outside of tab

Change-Id: I3d8a23f4438b41a367336507845baaea90cccc7e
2012-08-15 13:49:42 -07:00
Daniel Sandler
861e030314 am 2b207837: am 978f853d: Fix situations where the panel wouldn\'t descend.
* commit '2b2078370372e1e7c95c5ca466198a1db384db51':
  Fix situations where the panel wouldn't descend.
2012-08-15 12:55:47 -07:00
Daniel Sandler
2b20783703 am 978f853d: Fix situations where the panel wouldn\'t descend.
* commit '978f853d189c1857190b4a2e200c7a283e31ca14':
  Fix situations where the panel wouldn't descend.
2012-08-15 12:53:40 -07:00
Daniel Sandler
978f853d18 Fix situations where the panel wouldn't descend.
Change-Id: I41c1d6a973b2693487062f3a5fbf922ff2025897
2012-08-15 15:48:43 -04:00
Daniel Sandler
7e6c9a7c24 am acd7716a: am 2db99c56: Merge "Turn off chatty logging for everyone." into jb-mr1-dev
* commit 'acd7716a31e2e7896c9525a4eba4fffbc578831d':
  Turn off chatty logging for everyone.
2012-08-15 12:08:07 -07:00
Daniel Sandler
acd7716a31 am 2db99c56: Merge "Turn off chatty logging for everyone." into jb-mr1-dev
* commit '2db99c56f74013ee51950ac53062536be2edcd14':
  Turn off chatty logging for everyone.
2012-08-15 12:05:57 -07:00
Daniel Sandler
2db99c56f7 Merge "Turn off chatty logging for everyone." into jb-mr1-dev 2012-08-15 12:03:58 -07:00
George Mount
b046e049ec am bb8bdcd9: am 21029db1: Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev
* commit 'bb8bdcd9104a85f4f7e21cb882e766da7aef98d2':
  Number and telephone inputs -- use "Go" instead of "Next"
2012-08-15 10:47:29 -07:00
George Mount
bb8bdcd910 am 21029db1: Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev
* commit '21029db15769c9d57ffb972fb846e574ef2376ad':
  Number and telephone inputs -- use "Go" instead of "Next"
2012-08-15 10:46:16 -07:00
George Mount
21029db157 Merge "Number and telephone inputs -- use "Go" instead of "Next"" into jb-mr1-dev 2012-08-15 10:44:07 -07:00
Jeff Brown
76a2a59966 am e4e71e1d: am 194b6e97: Merge "Power manager rewrite." into jb-mr1-dev
* commit 'e4e71e1d06442726e23f8ccf66c75468634008c4':
  Power manager rewrite.
2012-08-15 10:30:52 -07:00
Jeff Brown
e4e71e1d06 am 194b6e97: Merge "Power manager rewrite." into jb-mr1-dev
* commit '194b6e971668ea32124bdc1b0f534fcb3e06ef9f':
  Power manager rewrite.
2012-08-15 10:28:15 -07:00
Scott Main
23e708821e am 7e6eeada: am 1d64f9f4: am 13f5ed25: am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev
* commit '7e6eeadadb7f306e206ee8b12bf579f62bfcbb82':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
2012-08-15 10:26:53 -07:00
Jeff Brown
194b6e9716 Merge "Power manager rewrite." into jb-mr1-dev 2012-08-15 10:26:03 -07:00
Scott Main
7e6eeadadb am 1d64f9f4: am 13f5ed25: am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev
* commit '1d64f9f4dadce40f8316c53467167d2c51169f9d':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
2012-08-15 10:25:15 -07:00
Scott Main
1d64f9f4da am 13f5ed25: am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev
* commit '13f5ed254a96273f6e7c6d5dc017465acd607283':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
2012-08-15 10:21:53 -07:00
George Mount
68c0c12631 Number and telephone inputs -- use "Go" instead of "Next"
Bug 6988736

Change-Id: I36e85832bdd53ea0f7eb422104966b403b8fbcdd
2012-08-15 10:15:50 -07:00
Jeff Brown
12c44d938e am c549d7fc: am 8ec8236f: Merge "Apply ValueAnimator scale factor immediately in WM." into jb-mr1-dev
* commit 'c549d7fc162285b237a824774df7826445635818':
  Apply ValueAnimator scale factor immediately in WM.
2012-08-15 10:10:17 -07:00
Jeff Brown
c549d7fc16 am 8ec8236f: Merge "Apply ValueAnimator scale factor immediately in WM." into jb-mr1-dev
* commit '8ec8236f5c600db0bf3e10908cc804ff7b2e3a5c':
  Apply ValueAnimator scale factor immediately in WM.
2012-08-15 10:07:44 -07:00
Jeff Brown
8ec8236f5c Merge "Apply ValueAnimator scale factor immediately in WM." into jb-mr1-dev 2012-08-15 10:04:38 -07:00
Scott Main
13f5ed254a am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev
* commit '18c2045bed1ee4e5615947bdc4539a6b4d4a1d23':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
2012-08-15 09:49:47 -07:00
Scott Main
18c2045bed Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 2012-08-15 09:47:27 -07:00
Baligh Uddin
6660ec707b am bc5b6e04: (-s ours) am 60a5fa4f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'bc5b6e049abbca7b1a5bc9aacf533f938d4abe43':
  Import translations. DO NOT MERGE
2012-08-15 09:32:12 -07:00
Baligh Uddin
bc5b6e049a am 60a5fa4f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '60a5fa4f47830fc2eb5cbeb48d7d49ee77cddb84':
  Import translations. DO NOT MERGE
2012-08-15 09:25:41 -07:00
Baligh Uddin
60a5fa4f47 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-15 09:23:08 -07:00
Baligh Uddin
dc7fa6a24f Merge "Import translations. DO NOT MERGE" 2012-08-15 09:21:03 -07:00
The Android Open Source Project
97d2483fba am b2d9c994: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'b2d9c994e5b9fd2cbc36603316198d5c4e2e4ac3':
  Revert "Add timestamp in scan results"
  Optimize interactions with glyph cache
  Stop screensaver on incoming phone call.
2012-08-15 08:29:28 -07:00
The Android Open Source Project
b2d9c994e5 Reconcile with jb-mr1-release - do not merge
Change-Id: Ibed0ae2922e16b9ae4183b6a96281108499900b1
2012-08-15 08:27:17 -07:00
Daniel Sandler
bf4aa9d5bc Turn off chatty logging for everyone.
Change-Id: I6c6f48012df8a551ae4f2b2a9cd2713184234763
2012-08-15 10:49:28 -04:00
Daniel Sandler
dac17a275f am 05b5391f: am 9cc9aeb0: Merge "Quick settings come to all Android devices." into jb-mr1-dev
* commit '05b5391f55de04f8aa9fe9ac107a4bbb021d08ca':
  Quick settings come to all Android devices.
2012-08-15 06:57:30 -07:00
Daniel Sandler
05b5391f55 am 9cc9aeb0: Merge "Quick settings come to all Android devices." into jb-mr1-dev
* commit '9cc9aeb07c9218dbcedb08107e298f1fddbbf235':
  Quick settings come to all Android devices.
2012-08-15 06:55:35 -07:00
Daniel Sandler
9cc9aeb07c Merge "Quick settings come to all Android devices." into jb-mr1-dev 2012-08-15 06:53:20 -07:00
Daniel Sandler
8e72c9e19c Quick settings come to all Android devices.
I mean, real soon now.

Change-Id: I9a15b49f271e7ae06eb48a402f58270d8adccbf4
2012-08-15 09:52:43 -04:00
The Android Automerger
1d2c384f57 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:34:17 -07:00
Steve Block
ae6cb93477 am 1d15cb0b: am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev
* commit '1d15cb0b37e4a5d0a7674da3fd321148d2cc1cd1':
  Clean up JavaDoc for CookieManager
2012-08-15 05:06:29 -07:00
Steve Block
1d15cb0b37 am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev
* commit '65dfac3bb5e1da2b4b84724cb7e39b47957ece4c':
  Clean up JavaDoc for CookieManager
2012-08-15 04:56:56 -07:00
Steve Block
65dfac3bb5 Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev 2012-08-15 04:15:08 -07:00
Jeff Brown
9630704ed3 Power manager rewrite.
The major goal of this rewrite is to make it easier to implement
power management policies correctly.  According, the new
implementation primarily uses state-based rather than event-based
triggers for applying changes to the current power state.

For example, when an application requests that the proximity
sensor be used to manage the screen state (by way of a wake lock),
the power manager makes note of the fact that the set of
wake locks changed.  Then it executes a common update function
that recalculates the entire state, first looking at wake locks,
then considering user activity, and eventually determining whether
the screen should be turned on or off.  At this point it may
make a request to a component called the DisplayPowerController
to asynchronously update the display's powe state.  Likewise,
DisplayPowerController makes note of the updated power request
and schedules its own update function to figure out what needs
to be changed.

The big benefit of this approach is that it's easy to mutate
multiple properties of the power state simultaneously then
apply their joint effects together all at once.  Transitions
between states are detected and resolved by the update in
a consistent manner.

The new power manager service has is implemented as a set of
loosely coupled components.  For the most part, information
only flows one way through these components (by issuing a
request to that component) although some components support
sending a message back to indicate when the work has been
completed.  For example, the DisplayPowerController posts
a callback runnable asynchronously to tell the PowerManagerService
when the display is ready.  An important feature of this
approach is that each component neatly encapsulates its
state and maintains its own invariants.  Moreover, we do
not need to worry about deadlocks or awkward mutual exclusion
semantics because most of the requests are asynchronous.

The benefits of this design are especially apparent in
the implementation of the screen on / off and brightness
control animations which are able to take advantage of
framework features like properties, ObjectAnimator
and Choreographer.

The screen on / off animation is now the responsibility
of the power manager (instead of surface flinger).  This change
makes it much easier to ensure that the animation is properly
coordinated with other power state changes and eliminates
the cause of race conditions in the older implementation.

The because of the userActivity() function has been changed
so that it never wakes the device from sleep.  This change
removes ambiguity around forcing or disabling user activity
for various purposes.  To wake the device, use wakeUp().
To put it to sleep, use goToSleep().  Simple.

The power manager service interface and API has been significantly
simplified and consolidated.  Also fixed some inconsistencies
related to how the minimum and maximum screen brightness setting
was presented in brightness control widgets and enforced behind
the scenes.

At present the following features are implemented:

- Wake locks.
- User activity.
- Wake up / go to sleep.
- Power state broadcasts.
- Battery stats and event log notifications.
- Dreams.
- Proximity screen off.
- Animated screen on / off transitions.
- Auto-dimming.
- Auto-brightness control for the screen backlight with
  different timeouts for ramping up versus ramping down.
- Auto-on when plugged or unplugged.
- Stay on when plugged.
- Device administration maximum user activity timeout.
- Application controlled brightness via window manager.

The following features are not yet implemented:

- Reduced user activity timeout for the key guard.
- Reduced user activity timeout for the phone application.
- Coordinating screen on barriers with the window manager.
- Preventing auto-rotation during power state changes.
- Auto-brightness adjustment setting (feature was disabled
  in previous version of the power manager service pending
  an improved UI design so leaving it out for now).
- Interpolated brightness control (a proposed new scheme
  for more compactly specifying auto-brightness levels
  in config.xml).
- Button / keyboard backlight control.
- Change window manager to associated WorkSource with
  KEEP_SCREEN_ON_FLAG wake lock instead of talking
  directly to the battery stats service.
- Optionally support animating screen brightness when
  turning on/off instead of playing electron beam animation
  (config_animateScreenLights).

Change-Id: I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
2012-08-15 03:06:24 -07:00