Commit Graph

40261 Commits

Author SHA1 Message Date
Robert Greenwalt
8f3799867d Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +00:00
Fabrice Di Meglio
b3d5856e68 am f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
2014-06-02 22:10:36 +00:00
Fabrice Di Meglio
b75a69f9b3 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:50:43 +00:00
John Reck
776512d4b6 am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev
* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA
2014-06-02 18:19:44 +00:00
John Reck
c6b3264e16 Add setStartValue to RNA
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
2014-06-02 11:00:09 -07:00
dcashman
559321abbf Merge "Add ArrayUtils methods and tests for consumption by KeySet code." 2014-06-02 17:34:09 +00:00
dcashman
874d0d4032 Add ArrayUtils methods and tests for consumption by KeySet code.
Adds methods for dealing specifically with long data types.  Used by
PackageKeySetData as part of the KeySet work.  Add appropriate test methods
to MoreAsserts as well.

Bug: 6967056
Change-Id: I1e263301b353e0cd1b45126be6ef5ec310f311a8
2014-06-02 10:29:40 -07:00
Jungshik Jang
11969e8266 Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:46 +00:00
Jungshik Jang
9b4d25a8c5 Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:31 +00:00
Jungshik Jang
9bb6fbb743 Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev 2014-06-02 04:35:58 +00:00
Jungshik Jang
1dcef4f9cd Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-preview-dev 2014-06-02 04:35:45 +00:00
Jungshik Jang
5a0d97b1c2 Merge "DO NOT MERGE: Add the constants for the callback result of SendCecCommand()." into lmp-preview-dev 2014-06-02 04:34:02 +00:00
Jinsuk Kim
af9d45e88b DO NOT MERGE: Register HdmiControlService
Register the new service that will replace HdmiCecService.
The old one will be removed once the client of the old service
finishes migration to the new service.

Change-Id: I3906292fcf0a7c8286bc89af21a03bd11d3a0e72
2014-06-02 11:03:45 +09:00
Jinsuk Kim
e74282b70b DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-06-02 11:02:51 +09:00
Jinsuk Kim
a8fd44b74b DO NOT MERGE: Fix a couple of bugs in CEC services
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
2014-06-02 10:58:02 +09:00
Jinsuk Kim
304b4a7281 DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
2014-06-02 10:56:57 +09:00
Yuncheol Heo
61ced38d61 DO NOT MERGE: Add the constants for the callback result of SendCecCommand().
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
2014-06-02 10:46:36 +09:00
Adam Powell
535499204b am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev
* commit '16b0baa45bd68bb05863d3a6e92b7e8e0b452cb2':
  Further implementation for ToolbarActionBar
2014-06-02 00:25:41 +00:00
Adam Powell
9558232a2e Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 2014-06-02 00:23:16 +00:00
Adam Powell
07a74548ae Further implementation for ToolbarActionBar
Integrate activity options menu and inline Toolbars. Fix a series of
small associated bugs.

Activities now (privately) offer several menu-related events directly
to the associated ActionBar. In the future this should help us
untangle some of the menu-based pasta in PhoneWindow.

Bug 15344598

Change-Id: I76211ad17d2bcbb58cf1d88914e855416d084ded
2014-06-01 17:15:42 -07:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
2014-06-01 16:44:28 -07:00
Alan Viverette
c3710eb20d Merge "Fixes hotspot list transitions, update to use a single hotspot" into lmp-preview-dev 2014-06-01 23:14:25 +00:00
Dongwon Kang
240b8368ce am 41e5f190: Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev
* commit '41e5f1907dc029ab5117b9f8bcbc69c7a0abaa11':
  Add a path for generic event from a session to an application in Tv Input Framework.
2014-06-01 23:13:44 +00:00
Dongwon Kang
0bf8a21464 Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 2014-06-01 23:09:31 +00:00
Alan Viverette
4d2f2483f6 Fixes hotspot list transitions, update to use a single hotspot
Also updates background and button colors to match spec, removes
dependency on bouncycastle Arrays. Vastly simplifies ripple drawing.
Adds APIs for maximum ripple radius. Makes selectableItemBackground
bounded by default and adds an unbounded version and theme attribute.

BUG: 15315168
BUG: 15314684
BUG: 15314830
BUG: 15316768
BUG: 15333033
BUG: 15344050
Change-Id: Ib0619587ce78e43056b66571bae185e0f1613185
2014-06-01 15:58:04 -07:00
Adam Powell
1462ddcbd6 am 56ac0185: Change parameter name for Activity#setActionBar
* commit '56ac018506f527ecd6b7a76adf824066371aa4fa':
  Change parameter name for Activity#setActionBar
2014-06-01 20:36:05 +00:00
Adam Powell
377801463e Change parameter name for Activity#setActionBar
Feedback from API review

Bug 14998253

Change-Id: Id3b87a8071d43de49847e93fd6229d48364bf55e
2014-06-01 13:31:00 -07:00
John Spurlock
3a9b632ef2 am 74e2bdba: Settings: Keep SeekBarVolumizer in sync with audio stream.
* commit '74e2bdbaa13d8519fb6e98aac016bcde62d50f73':
  Settings: Keep SeekBarVolumizer in sync with audio stream.
2014-06-01 17:08:13 +00:00
John Spurlock
0dbf1a6be2 Settings: Keep SeekBarVolumizer in sync with audio stream.
Use AudioManager.VOLUME_CHANGED_ACTION instead of relying
on obsolete settings.

Bug:15343543
Change-Id: Ia95237bb455268314ec985affe92b0cec6b52e29
2014-06-01 13:01:23 -04:00
Amith Yamasani
f20d640fa2 Restrictions Manager
Mechanism to register a provider for requesting an
administrator to respond to permission requests.

Request format and response format constants.

Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.

Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.

Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
2014-05-31 16:41:35 -07:00
Elliott Hughes
f8abeb8457 resolved conflicts for merge of 04c987a8 to master
Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe
2014-05-30 20:13:15 -07:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API.
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
2014-05-30 19:20:20 -07:00
Adam Powell
fb50dd580d am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev
* commit '8ce8cb05143964700d85067fc88ae914f382f0c4':
  Collapse contentInsets and View margins in Toolbars
2014-05-31 02:00:36 +00:00
Jorim Jaggi
8cdef8293f am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev
* commit '698c81948ed277253d567aa4c34996d2d0477992':
  Fade scrim in unlock animation.
2014-05-31 01:56:15 +00:00
Adam Powell
6a2d5e5b54 Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev 2014-05-31 01:54:48 +00:00
Adam Powell
7a32401c2a Collapse contentInsets and View margins in Toolbars
As content insets are meant to help line up the edges of views with
the content in adjacent ViewGroups, collapse individual view margins
with the insets to preserve this property. Margins still define a
minimum spacing between adjacent sibling views or the edges of the
Toolbar container.

Bug 15328526

Change-Id: I786ccdbed6b40930250fa22e2a6d0376d759f2d2
2014-05-30 18:52:37 -07:00
Fabrice Di Meglio
ca37602794 Code cleaning
- fix some typos

Change-Id: Ia5a5c26e85569435715c4efb3d8740f508545b90
2014-05-30 18:20:50 -07:00
Jorim Jaggi
d48d7a6d50 Merge "Fade scrim in unlock animation." into lmp-preview-dev 2014-05-31 01:09:19 +00:00
Jorim Jaggi
e29b2dbc76 Fade scrim in unlock animation.
This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
2014-05-31 02:48:06 +02:00
Dianne Hackborn
00fcdc1236 am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.
2014-05-31 00:00:05 +00:00
Dianne Hackborn
725010a83f Merge "Clean up voice API." into lmp-preview-dev 2014-05-30 23:54:11 +00:00
Jeff Sharkey
43e1565370 am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
  Per-app media directories on external storage.
2014-05-30 23:51:46 +00:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Dianne Hackborn
a2c076d540 Clean up voice API.
Add various java docs.

Switch to CharSequence where appropriate.

Add new request for canceling voice interaction.

Also update test app to follow API changes and be more better.

Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
2014-05-30 16:42:57 -07:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage.
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
2014-05-30 16:26:45 -07:00
Adam Powell
92bcf31f54 am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev
* commit '338382de18d9df699c15eb9adbaaa50d8a6664fd':
  Fix action bar title TextAppearance usage for Toolbar decor
2014-05-30 23:25:23 +00:00
Adam Powell
ae706066e1 Merge "Fix action bar title TextAppearance usage for Toolbar decor" into lmp-preview-dev 2014-05-30 23:21:33 +00:00