83872 Commits

Author SHA1 Message Date
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
Billy Hewlett
88455fa13f Han Preference
Data: label MTLmr3m with "ja" locale attribute, fallback_fonts-ja.xml removed,
as we only need a single fallback font file
Code: Add locale and variant to TextLayoutCache.  Paint.java sets textLocale as
the language (for example, "ja") rather than the language/locale concatenated
(for example "ja_JP")

This checkin, along with Change-Id: Id8c91ae0be6cad8a7ef77a0cd5803676290986c1,
allows text view objects to set their locale dynamically and skia will use the
correct font for the locale.

Change-Id: Ib5dd86950156c5a438f25c289acb839206bb455a
2012-08-15 09:01:51 -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
Jeff Brown
ff7e6ef4f1 Apply ValueAnimator scale factor immediately in WM.
Normally the ValueAnimator scale factor is applied the first
time a ViewRootImpl window session is created but that may
be too late for animators created by system services that
start early in the boot process.  So set the scale factor
immediately whenever the setting changes.

Also make ValueAnimator.getDurationScale() accessible (but @hide)
for custom animators that want to apply the same scale to
their animations.

Change-Id: I0f5a750ab5b014f63848445435d8dca86f2a7ada
2012-08-15 02:09:05 -07:00
Jeff Brown
e40e367ea9 am 02ccc14b: am f8d9e2fc: Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev
* commit '02ccc14bada432a695ffb1e33857482cc439d01c':
  Make all messages in KeyguardViewMediator asynchronous.
2012-08-14 21:32:55 -07:00
Jeff Brown
02ccc14bad am f8d9e2fc: Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev
* commit 'f8d9e2fccdd9f2addeda852ad168eeb67a5f6626':
  Make all messages in KeyguardViewMediator asynchronous.
2012-08-14 21:31:14 -07:00
Jeff Brown
f8d9e2fccd Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev 2012-08-14 21:28:52 -07:00
Baligh Uddin
395d3be7f8 Import translations. DO NOT MERGE
Change-Id: I536df2ccc50c29c1fd440a6fa1f24f8e8b704471
Auto-generated-cl: translation import
2012-08-14 20:54:28 -07:00
Baligh Uddin
09b5860eff Import translations. DO NOT MERGE
Change-Id: Ic6337da8777142f784a849c807e416a09c4c7ae2
Auto-generated-cl: translation import
2012-08-14 20:46:08 -07:00
Jeff Brown
109025d778 Make all messages in KeyguardViewMediator asynchronous.
We don't want these messages to get blocked by UI traversals.

Added a convenience for creating Handlers that always send
asynchronous messages.

Change-Id: Id568e87fcb8b169e8c52c5fe1dc76a4a5771570b
2012-08-14 20:44:44 -07:00
Dianne Hackborn
c4b584e8d6 am a8ec1f8d: am 595b6565: am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit 'a8ec1f8d5b22a8dc71b5b8a30aa711846baac7f0':
  Keep keyguard from starting after finished call when screen is on
2012-08-14 19:38:17 -07:00
Dianne Hackborn
a8ec1f8d5b am 595b6565: am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '595b6565dcac3af10983310dff6dcfb88b11f457':
  Keep keyguard from starting after finished call when screen is on
2012-08-14 19:36:27 -07:00
Dianne Hackborn
595b6565dc am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19':
  Keep keyguard from starting after finished call when screen is on
2012-08-14 19:34:14 -07:00
Dianne Hackborn
977abbb887 am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on
2012-08-14 19:31:55 -07:00
Dianne Hackborn
48de12c5d1 Merge "Keep keyguard from starting after finished call when screen is on" 2012-08-14 18:51:00 -07:00
Dianne Hackborn
0edc9710b3 am 5cdb2480: am abac0cd1: Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev
* commit '5cdb2480cea21d3bf8862dfb82b13a9deb21813f':
  Add PendingIntent and IntentSender APIs to get user handle.
2012-08-14 18:29:42 -07:00
Dianne Hackborn
5cdb2480ce am abac0cd1: Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev
* commit 'abac0cd16105c60fdd6c5ce37116c972dc7431bb':
  Add PendingIntent and IntentSender APIs to get user handle.
2012-08-14 18:27:21 -07:00
Dianne Hackborn
abac0cd161 Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev 2012-08-14 18:24:59 -07:00
Dianne Hackborn
c7501279ee Add PendingIntent and IntentSender APIs to get user handle.
Also uid.

Change-Id: I0a328d0cc2bbc17dc0a49b7b8b8d515af80f1e15
2012-08-14 18:05:05 -07:00