Commit Graph

45741 Commits

Author SHA1 Message Date
James Cook
db871da48f Merge "Improvements to TextView Ctrl-Z undo support" 2015-02-23 20:31:14 +00:00
James Cook
7713d18847 Improvements to TextView Ctrl-Z undo support
* Undo/redo restores cursor position
* Multiple deletes are consolidated into a single operation
* Don't create undo history for invalid or no-op operations
* Move logic for merging operations into Editor.EditOperation

CTS tests in android.widget.cts.TextViewTest will land separately.

Bug: 19332904
Bug: 19450037
Change-Id: I9c7887aecdd0209e783fb7cda4cb7081a97a98cd
2015-02-23 12:23:47 -08:00
Scott Kennedy
7be99fc667 Merge "Add some more @Nullable annotations" 2015-02-23 19:09:19 +00:00
Clara Bayarri
6f542f5a40 Merge "Floating toolbars: Encapsulate StandaloneActionMode view creation." 2015-02-23 17:49:47 +00:00
Jorim Jaggi
24bec7ce7a Implement nice transitions for light status bar
- When the flag changes, apply an animation from the current value
- When the flag change is caused by an app transition, synchronize
  the status bar animation with the app transition animation.
  PhoneWindowManager calculates the timings based on some heuristics
  of the app transition animations and supplies these timings to
  StatusBarService.

Bug: 19233606
Change-Id: I4f99afba8f1eebb3524699ed4d7fbafee5463a37
2015-02-23 13:08:41 +01:00
Jorim Jaggi
77ba4803a5 Add AppTransitionListener
Introduces the concept of a listener to be notified about app
transition events. The only client at the moment is window manager
which notifies activity manager about completed transitions, but this
can be used for various clients, including the status bar.

Bug: 19233606
Change-Id: Ia6fec5837b6eb4db90f3cb1c999d3f157ba6dd4a
2015-02-23 12:44:25 +01:00
Narayan Kamath
3ef69833fe am 836e4413: am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '836e4413d03d8699fa8817999fe9a1ff65541c29':
  Clean up Javadocs for UEventObserver
2015-02-23 11:06:44 +00:00
Narayan Kamath
836e4413d0 am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit 'c90df0768a9be3e40d7c1edfdfb28af7bd25d98e':
  Clean up Javadocs for UEventObserver
2015-02-23 11:00:51 +00:00
Narayan Kamath
c90df0768a am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver
2015-02-23 10:54:40 +00:00
Valter Strods
7014b26c3e Clean up Javadocs for UEventObserver
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
2015-02-23 10:48:32 +00:00
Scott Kennedy
3c32b62044 Add some more @Nullable annotations
Change-Id: I586d542e087eafa8355f0eaa606d66876c0f5a56
2015-02-22 20:43:56 -08:00
Yin-Chia Yeh
dc0ba09515 Camera: codegen doc update
Codegen doc update only.

Change-Id: I444d59effb957e58b14c363174693cd6c7c84ebd
2015-02-20 15:52:06 -08:00
Alan Viverette
c0a9a7ad6d Merge "Use ObjectAnimator for fading scrollbars, set initial duration to 1500" 2015-02-20 22:31:49 +00:00
Daniel Rosenberg
8e4b80eda7 Merge "Disable checking bootimage build fingerprint against vendor" 2015-02-20 22:05:39 +00:00
Alan Viverette
955471300c Merge "Update time picker to match latest Material spec" 2015-02-20 22:03:06 +00:00
Daniel Rosenberg
159c205dea Disable checking bootimage build fingerprint against vendor
There is currently an issue somewhere regarding these checks on
some devices. Disabling them until those issues are resolved.

Bug: 19058575
Change-Id: Id5ce93c2d4069d3058636b8e12317e200229472b
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2015-02-20 13:18:20 -08:00
Ying Wang
7f38aab7ab Fix docs.
Change-Id: Iaa7f498dac5b87ee8f3cc6cfeabb04b51ce93245
2015-02-20 11:50:09 -08:00
Alan Viverette
72710f11ec Use ObjectAnimator for fading scrollbars, set initial duration to 1500
Fairly intensive refactoring of ScrollabilityCache.

Change-Id: I88669c0b9b79ca12a237606d5ff8be0e7e8b37ba
2015-02-20 11:10:22 -08:00
Alan Viverette
adbc95f015 Update time picker to match latest Material spec
Also removes saveLayerAlpha() call from radial time picker's disabled
drawing path.

Bug: 19431361
Change-Id: I18641bb9544107bb8704fc43d0dd6c5b18ff99ce
2015-02-20 10:51:33 -08:00
Yohei Yukawa
576f722175 Merge "Normalize deprecated 2-letter language code when necessary." 2015-02-20 17:33:52 +00:00
Yohei Yukawa
f487e0e395 Normalize deprecated 2-letter language code when necessary.
This is a follow up CL for I7d932e60311b80c05be8f02c9e803f18da0e0054,
which revealed that we could not use deprecated 2-letter code like "in"
to query subtype which has new language codes like "id".

This CL addresses the above issue by normalizing the language code
with Locale#Locale(String, String) before comparing one to another.

Change-Id: I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10
2015-02-21 02:26:40 +09:00
Alexandra Gherghina
eeab1fa96c Merge "New intent action for returning account migration result" 2015-02-20 16:46:24 +00:00
John Reck
df570c6e66 Merge "Initial attempt at jank-tracking stat collection" 2015-02-20 16:28:30 +00:00
John Reck
ba6adf66d3 Initial attempt at jank-tracking stat collection
Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
2015-02-20 08:27:38 -08:00
Alexandra Gherghina
db4bc57760 New intent action for returning account migration result
Bug: 18551835
Change-Id: Ifc5dedf1753a7779793a8b056bac5f5733a2783d
2015-02-20 11:55:52 +00:00
Clara Bayarri
7415d6667e Merge "Floating Toolbars: Wrap the ActionMode creation in DecorView" 2015-02-20 10:26:15 +00:00
Santos Cordon
c86703f575 Merge "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 2015-02-20 08:45:49 +00:00
Santos Cordon
d4ceaf6167 Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
2015-02-19 23:43:12 -08:00
Dianne Hackborn
5f83382c40 Merge "Add some detailed data as part of battery history." 2015-02-20 01:41:29 +00:00
Dianne Hackborn
d1eccbea38 Add some detailed data as part of battery history.
Every time the battery level changes, a new extended
detailed use data structure is written to the history.
This currently only contains delta CPU use since the
last detailed entry (total CPU and to three uids), but
it gives us the infrastructure for adding more detailed
data in the future.

A detail entry for regular history looks like:

     Details: cpu=15730u+2307s (u0a57=11312u+502s, 1000=2344u+701s, 0=473u+991s)
              /proc/stat=15377 usr, 1797 sys, 197 io, 0 irq, 8 sirq, 23103 idle (42.9% of 6m 44s 820ms)

u is user-space cpu time, s is system/kernel time.

The equivalent check-in output is:

9,h,0,Dcpu=15730:2307/10057:11312:502/1000:2344:701/0:473:991
9,h,0,Dpst=15377,1797,197,0,8,23103

Also add a new "unplug" command to the battery service,
to easily put it into a state where it always considers
the device to be running on battery.

Change-Id: Ic76d966f11e592b9dd671879977bf999ebc11eef
2015-02-19 17:37:12 -08:00
Craig Mautner
4f9796e028 Merge changes Ib2def344,Ifd15736b
* changes:
  Permit layout when stopped if reporting draw
  Refactor computeScreenConfigurationLocked and more.
2015-02-20 01:35:17 +00:00
Craig Mautner
72d6f21943 Permit layout when stopped if reporting draw
When a device was woken up in a different orientation than what it
went to sleep in, the window manager would force a resize to get it to
predraw in the new orientation. The predraw was done in the old
orientation however because layouts are skipped when the activity was
stopped.

This change allows layouts to proceed when the activity is stopped if
the flag to report resize events is true.

Fixes bug 18444400.

Change-Id: Ib2def3449dd67918f6fb838bdb1fe5cc6ec57f8e
2015-02-19 16:51:26 -08:00
Scott Kennedy
d390401373 Merge "Mark Service#onBind() @Nullable" 2015-02-19 23:54:03 +00:00
Scott Kennedy
7db73ed198 Mark Service#onBind() @Nullable
Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
2015-02-19 15:31:11 -08:00
Scott Kennedy
004a46eb17 Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable" 2015-02-19 23:19:07 +00:00
Clara Bayarri
399b51397b Floating toolbars: Encapsulate StandaloneActionMode view creation.
This CL defines a new interface to be used by ActionModeWrapper.
This allows each client to inject a different primary ActionMode to
the wrapper and keep view creation code next to ActionMode
creation.
The interface method is only called when the wrapper actually
knows that will be the used type, avoinding unnecessary view
creations.

Things pending after this CL:
- Correct handling of ActionModes created by
callback.onWindowStartingActionMode(). This includes all current usages
in an existing ActionBar, as it is handled by Activity. In the current
state, we do not intercept these ActionModes and hence cannot change the
representation.
- Representing the floating type
- Supporting two ActionModes in parallel in DecorView, one of each type

Change-Id: Ic38e209877c3876161d8dd56902e25b51fbe40b6
2015-02-19 22:42:20 +00:00
Clara Bayarri
ed2a54cfd3 Floating Toolbars: Wrap the ActionMode creation in DecorView
This change will allow us to create ActionMode representations on the
fly after onCreateActionMode by using the Decorator pattern. The new
ActionModeWrapper will be responsible for the creating the
appropriate ActionMode depending on the type chosen by the client,
and setting it up.

Things pending that are NOT addressed by this CL:
- ActionModes created by callback.onWindowStartingActionMode(). This
includes all current usages in an existing ActionBar, as it is
handled by Activity. This requires some additional refactoring.
- Representing the floating type
- Moving the view creation code specific to StandaloneActionMode
from DecorView to ActionModeWrapper, decoupling DecorView from
StandaloneActionMode completely
- Supporting two ActionModes in parallel in DecorView, one of each type

Change-Id: I1a8db711f53b771eac74f0e6496106acf1ca2727
2015-02-19 22:40:31 +00:00
James Cook
c20f54aff6 Merge "Add basic support for Ctrl-Z to editable TextViews" 2015-02-19 18:36:19 +00:00
Scott Kennedy
6cd132fef2 Annotate the parameter in TextUtils#isEmpty() as @Nullable
Change-Id: Iaccf7f568952399d5eb48c15a5428317dd75052a
2015-02-19 10:36:12 -08:00
James Cook
9201e79783 Add basic support for Ctrl-Z to editable TextViews
* Add an UndoManager to the Editor for each editable TextView
* Record operations as being owned by that Editor
* Parcel the undo state
* Wire hardware keyboard shortcuts Ctrl-Z for undo and Ctrl-Shift-Z
  for redo into TextView shortcut handling.
* Expose IDs for "undo" and "redo" for symmetry with cut/copy/paste.

Tests in CTS TextViewTest will land separately in ag/635321

Bug: 19332904
Change-Id: Ibd23843f86b4cd556751faa0b3ad1f35d6d49785
2015-02-19 10:32:14 -08:00
John Spurlock
0a7269bbaf Merge "AudioAttributes: introduce new flags to bypass audio restrictions." 2015-02-19 18:24:24 +00:00
Nicolas Prevot
3558752ec7 Merge "Improve the documentation of DISALLOW_CONFIG_BLUETOOTH." 2015-02-19 11:19:32 +00:00
John Spurlock
bbfd31a5d4 AudioAttributes: introduce new flags to bypass audio restrictions.
- New @hidden @SystemApi FLAG_BYPASS_INTERRUPTION_POLICY, request
   to ignore any current audio restrictions, such as zen mode
   content-based notification filtering.
 - Wire up FLAG_BYPASS_INTERRUPTION_POLICY to the existing
   audio restriction checks in the framework.

 - New @hidden @SystemApi FLAG_BYPASS_MUTE, request to play
   audibly, even if the underlying stream is muted.
 - Wiring up to audio framework TBD.

 - Use both of these new flags on the inline volume slider
   controls used in Settings, ensuring playback is heard
   regardless of the current device filter state.

Bug: 19407114
Change-Id: I3d44394931592ccbc1b61ddd9a4d1cc984da17cc
2015-02-18 20:48:26 -05:00
Wale Ogunwale
9176a30d36 Merge "Set compatInfo to default if unset in ContextImpl constructor." 2015-02-19 01:05:29 +00:00
Wale Ogunwale
9cf9954432 Set compatInfo to default if unset in ContextImpl constructor.
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
2015-02-18 16:31:34 -08:00
Mohamad Ayyash
97ae891df2 Merge "AlsaCardsParser: Ensure line is not NULL when reading Cards File." 2015-02-18 21:31:38 +00:00
Adrian Roos
a187960989 Merge "Set the light status flag based on right window" 2015-02-18 20:37:57 +00:00
Mohamad Ayyash
f98e1c72fc AlsaCardsParser: Ensure line is not NULL when reading Cards File.
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-02-18 12:35:48 -08:00
Nicolas Prevot
1c4c442e45 Improve the documentation of DISALLOW_CONFIG_BLUETOOTH.
BUG:19315055

Change-Id: Ic92a7b79f8113cad0474d62b0c615a1ada91838b
2015-02-18 19:28:21 +00:00
Tor Norbye
a42d2eaf2d Merge "Add @ResourceInt annotations on APIs" 2015-02-18 19:24:01 +00:00