Commit Graph

49736 Commits

Author SHA1 Message Date
Filip Gruszczynski
cfb3185a27 am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
* commit '0fbcc7086fe742e641915ed5f097119d01613cb5':
  Burn in protection.
2015-02-25 21:47:12 +00:00
Roozbeh Pournader
001f0b31b6 Merge "Document the limitations of Linkify addresses" 2015-02-25 21:43:50 +00:00
Roozbeh Pournader
1ff7196be9 Document the limitations of Linkify addresses
Explain that we are using WebView#findAddresses() which is
limited to US addresses at the moment (at least according
to its documentation), among various other limitations.

Bug: 5847264
Change-Id: If86c6d7c11cc080f0fe3401ffb7bce8068c6016f
2015-02-25 13:40:52 -08:00
Filip Gruszczynski
0fbcc7086f am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.
2015-02-25 21:40:38 +00:00
Filip Gruszczynski
d2e8640c2c Burn in protection.
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
2015-02-25 12:22:49 -08:00
Fyodor Kupolov
47ed3195f9 Merge "Allow alternative policy description for secondary users" 2015-02-25 20:17:21 +00:00
Filip Gruszczynski
924a18baa2 am cf8c112e: am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
* commit 'cf8c112ed87752d79a869de9426b5c5a950b5c43':
  Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:52:02 +00:00
Filip Gruszczynski
cf8c112ed8 am 01dd0e86: Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev
* commit '01dd0e86546a5bf815dd9a6e7cd4b7bf8e8f5719':
  Force translucency from windowIsTranslucent on SwipeDismissLayout.
2015-02-25 18:44:57 +00:00
Filip Gruszczynski
01dd0e8654 Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev 2015-02-25 18:40:20 +00:00
Jim Miller
74160d8cdb am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a':
  Remove TrustAgent whitelisting API
2015-02-25 18:30:10 +00:00
Jim Miller
b060f018ef am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API
2015-02-25 18:23:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
2015-02-25 18:09:54 +00:00
Keisuke Kuroyanagi
434fcf1588 Merge "Paste as plain text by Ctrl-Shift-V" 2015-02-25 08:00:32 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Filip Gruszczynski
23958c6e2f Force translucency from windowIsTranslucent on SwipeDismissLayout.
Bug: 18799741

Change-Id: Ifb05869f1bf080d7555d7728dc085c41cc2c277c
2015-02-24 16:59:45 -08:00
Wale Ogunwale
9fc3cef1c7 Merge "Added ActivityManager API and AM command to resize a task." 2015-02-24 18:32:57 +00:00
Jorim Jaggi
df4943d5e0 Merge "Do not forceLayout when window is resized" 2015-02-24 18:13:23 +00:00
Wale Ogunwale
53a29a90f3 Added ActivityManager API and AM command to resize a task.
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.

Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
2015-02-24 09:33:18 -08:00
Fyodor Kupolov
b343d6db28 Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: Idadbdf84d378cf4f1b42ac246a48edbfa97eaa9a
2015-02-24 09:26:09 -08:00
James Cook
8ee1d64c0a Merge "Change UndoManager mOwners from HashMap to ArrayMap" 2015-02-24 14:55:51 +00:00
Narayan Kamath
419389c52a am fd335f84: am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"
* commit 'fd335f8467259410c0a55733331e10531141e76e':
  Remove wrong javadoc comment
2015-02-24 10:28:12 +00:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment"
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Chad Jones
1fb5528643 resolved conflicts for merge of 57bb5f5c to master
Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c
2015-02-23 21:19:58 -08:00
Chad Brubaker
7d0c22e21b am 3576ca1f: am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '3576ca1f9bd1e46101ad940cc5923ac9965cfafe':
  Add Keymaster 0.4 binder API
2015-02-24 04:54:34 +00:00
Keisuke Kuroyanagi
b103709d02 Paste as plain text by Ctrl-Shift-V
Detect Ctrl-Shft-V in onKeyShortcut() and perform paste
as plain text.

Bug: 19287899
Change-Id: I0b27bf6155222a042eeb61dfbd4544c8312904ce
2015-02-24 12:51:46 +09:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
2015-02-24 00:46:48 +00:00
James Cook
761a4b3335 Change UndoManager mOwners from HashMap to ArrayMap
The number of undo operation owners is small (and usually one),
so save memory by switching to ArrayMap.

Bug: 19332904
Change-Id: Ic32cd49c292db2eaab1739cea8e8e518e68bd826
2015-02-23 16:20:16 -08:00
Mike Lockwood
f3c7276a4f Merge "Add MIDI Manager API tweaks:" 2015-02-23 23:03:36 +00:00
Chad Brubaker
3576ca1f9b am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API
2015-02-23 22:53:01 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
2015-02-23 22:45:01 +00:00
Mike Lockwood
b673770f71 Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi

- Add option for specifying a Handler for DeviceCallback notifications

Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
2015-02-23 14:32:23 -08:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
2015-02-23 14:12:37 -08:00
Alan Viverette
6a8253fdc9 Update progress bar and seek bar backgrounds, fix seek bar thumb
Ensures LayerDrawable copies out the correct layer properties during
"tileification". This really needs to be deprecated or replaced in a
future CL, though, because it is potentially lossy (e.g. for
RippleDrawable, which is an instanceof LayerDrawable).

Bug: 19448441
Change-Id: I483e9c34fd781e280c13eb5951f96bc71a252819
2015-02-23 12:49:47 -08:00
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