Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,193 Commits 3 Branches 0 Tags
9986e646433941dff16dd198d5c64361ea9f778e
Commit Graph

39851 Commits

Author SHA1 Message Date
Dianne Hackborn
9986e64643 am ceb86f91: am f5b988b8: Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 
* commit 'ceb86f912d9cc0cc0fa62f712b0105a5d239a973':
  Work on issue #17011123: Hit Back/Recents button when in Recents...
 2014-08-22 20:22:53 +00:00
Dianne Hackborn
250bf41b8e Merge "Work on issue #17011123: Hit Back/Recents button when in Recents..." into lmp-dev 2014-08-22 20:05:39 +00:00
Ronghua Wu
25a4b4b3dd am 4f643cf0: am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '4f643cf0e7736b5be31419b38890cd92d6586936':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:33:17 +00:00
Ronghua Wu
306afb9142 Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 2014-08-22 19:16:58 +00:00
Michael Wright
bbd512a4f3 am b6f74d87: am f3091f94: Merge "Add Voice Assist key." into lmp-dev 
* commit 'b6f74d877ea382a5f739b0687a34e3fd79ea12f0':
  Add Voice Assist key.
 2014-08-22 18:20:45 +00:00
Yorke Lee
6bc654e073 am c04818f7: am 82f28d2d: Merge "Update normalized phone number for contact for successful call" into lmp-dev 
* commit 'c04818f749931cedb8d59c4bd7277940752a894f':
  Update normalized phone number for contact for successful call
 2014-08-22 18:08:15 +00:00
Michael Wright
931b2e7c3a Merge "Add Voice Assist key." into lmp-dev 2014-08-22 18:02:27 +00:00
Ronghua Wu
0e9e3b213e VideoView: unhide setVideoURI api and add document. 
Bug: 16899444
Change-Id: I576a4b334d8b1fe89f93df3587386ac7f9455687
 2014-08-22 10:56:36 -07:00
Yorke Lee
eda777592b Merge "Update normalized phone number for contact for successful call" into lmp-dev 2014-08-22 17:55:49 +00:00
Kenny Guy
dabe02d6ca am 1b637e65: am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '1b637e652374daa50524623852fd3cdc868a8117':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:37:46 +00:00
Kenny Guy
91d065bcbf Merge "Fix notification badge when line 3 not shown." into lmp-dev 2014-08-22 14:20:31 +00:00
Kenny Guy
98193ea54f Fix notification badge when line 3 not shown. 
Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.

Bug: 16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d
 2014-08-22 13:30:58 +01:00
Yohei Yukawa
75830944a8 am 3756a2e2: am dc42737e: Remove CursorAnchorInfoRequest and related stuff 
* commit '3756a2e2b17bee21d729c99488635d7d93010ce0':
  Remove CursorAnchorInfoRequest and related stuff
 2014-08-22 09:17:28 +00:00
Yohei Yukawa
a277db28e9 Remove CursorAnchorInfoRequest and related stuff 
This CL removes CursorAnchorInfoRequest and related stuff
in favor of InputConnection.requestUpdateCursorAnchorInfo,
which is more easy to understand. This CL also deprecates
InputMethodManager#updateCursor and related stuff.

Rationale:
1. The spec of #updateCursor says that it provides the cursor
   position in local coordinates, while the input method
   requires it in the screen coordinates.
2. #updateCursor has never been enabled in AOSP, because
   InputMethodManager#isWatchingCursor always returned false.
3. There has been no way to let
   InputMethodManager#isWatchingCursor return true.
4. In L, InputMethodManager#updateCursorAnchorInfo is
   introduced to address all the issues above.

Given that we no longer need to support #updateCursor,
CursorAnchorInfoRequest is overkill when we need to convey
just a couple of parameters.

BUG: 17185263
BUG: 17182367

Change-Id: I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef
 2014-08-22 00:55:06 -07:00
Jungshik Jang
304eaeed8b am ebe59a04: am 952e276a: Merge "Implement interfaces for MHL scratchpad command" into lmp-dev 
* commit 'ebe59a04fb308713eeb5a546aa8568c7b2177937':
  Implement interfaces for MHL scratchpad command
 2014-08-22 05:38:01 +00:00
Jungshik Jang
6385953604 Merge "Implement interfaces for MHL scratchpad command" into lmp-dev 2014-08-22 05:22:47 +00:00
Chet Haase
9055f9250e am 0a0642c3: am 18237f09: Merge "Fix docs for circular reveal" into lmp-dev 
* commit '0a0642c310a6e9248ae16cb6e67a67ca9fe641cd':
  Fix docs for circular reveal
 2014-08-22 04:27:49 +00:00
Chet Haase
bc07081827 Merge "Fix docs for circular reveal" into lmp-dev 2014-08-22 04:12:50 +00:00
Lorenzo Colitti
18bcd9561d am f325858e: am fa79cdb6: Merge "Rework the per-network URL API." into lmp-dev 
* commit 'f325858e128c77791d245a9a54aec0dbfc8665f0':
  Rework the per-network URL API.
 2014-08-22 03:35:06 +00:00
Lorenzo Colitti
e258de6f9e Merge "Rework the per-network URL API." into lmp-dev 2014-08-22 03:07:28 +00:00
Adam Powell
658d324532 am c178c63a: am 4cccb38e: Merge "Directly propagate Activity titles to action bars" into lmp-dev 
* commit 'c178c63a1a4fbc80e3b632fbaa98561dc8a7e470':
  Directly propagate Activity titles to action bars
 2014-08-22 02:59:54 +00:00
Alan Viverette
c7a2d8a066 am aa311e15: am 37ec02e0: Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev 
* commit 'aa311e1599135ab48305e7cde5b219cae72d3f93':
  Clean up nullable listeners in date and time picker delegates
 2014-08-22 02:59:26 +00:00
Jeff Sharkey
cdd400aee1 am b81b5176: am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev 
* commit 'b81b51760e627eec388d2bbf9c27c6e8c46e28de':
  Guard against EOF when reading in FileBridge.
 2014-08-22 02:59:21 +00:00
Jungshik Jang
f424932cfb Implement interfaces for MHL scratchpad command 
1. Add sendScratchpadCommand to IHdmiControlService interface,
which is used to send scratchpad command.

2. Add IHdmiMhlScratchpadCommandListener to handle incoming
MHL scratchpad command.

Bug: 17146522

Change-Id: I8e8e743dc08a18c80867be470997ce79d3292c15
 2014-08-22 11:45:50 +09:00
Lorenzo Colitti
9f1274b7e4 Rework the per-network URL API. 
This addresses API council comments.

Bug: 17112978
Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0
 2014-08-21 19:09:27 -07:00
Michael Wright
dc63f7b91c Add Voice Assist key. 
The action taken is dependent on whether the device is in an
interactive state, allowing for interactions to work even when the
device isn't actively being used

Bug: 16292420
Change-Id: I897f4383e7e4766c0bcb6246b41514b46e03a9ac
 2014-08-21 19:05:21 -07:00
Chet Haase
4c902fa56d Fix docs for circular reveal 
Issue #17189634 API Review: reveal animation

Change-Id: Iffcec2669368fc95b50ddcba63d0f5c552f49231
 2014-08-21 18:55:38 -07:00
Adam Powell
13c3d9622f Merge "Directly propagate Activity titles to action bars" into lmp-dev 2014-08-22 01:18:23 +00:00
Adam Powell
a557fdcfb8 Directly propagate Activity titles to action bars 
Window decor action bars already inherit window title changes if no
explicit action bar title has been set but from an Activity's
perspective setting the activity title is a stronger signal. This is
especially relevant when the activity's action bar has been provided
by the application in the form of a Toolbar.

Bug 17138048

Change-Id: Ibf042cab6bbda3dc29590c09d1a0910b6ba78870
 2014-08-21 18:05:53 -07:00
Eino-Ville Talvala
5705c8f5f2 am 9c324750: am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit '9c324750a37db67d00724056942cfe221ad6521f':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 01:05:03 +00:00
Alan Viverette
87545c5a24 Merge "Clean up nullable listeners in date and time picker delegates" into lmp-dev 2014-08-22 01:02:02 +00:00
Jeff Sharkey
8e28c9c315 Merge "Guard against EOF when reading in FileBridge." into lmp-dev 2014-08-22 00:58:02 +00:00
Jeff Sharkey
5f1ed727e2 Guard against EOF when reading in FileBridge. 
Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
 2014-08-21 17:54:29 -07:00
Dianne Hackborn
6f4d61ff2e Work on issue #17011123: Hit Back/Recents button when in Recents... 
...without interacting with any of the Recents items should not bring
Home back to top

Up navigation needs to be smarter about multi-document and in the case
of being at the root of a document know to re-construct a task for
the app.

Change-Id: Ief874e46e9a9897379dda1010bcce4c5b03d82f1
 2014-08-21 17:50:42 -07:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Yin-Chia Yeh
c33f32db54 am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit '173871c9cecf3a72907e73a214523a93a8b0d82c':
  Camera2: add toString for two params classes
 2014-08-22 00:38:04 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
Yorke Lee
3dbc1185fb Update normalized phone number for contact for successful call 
Bug: 13792353

Change-Id: I6461bd225994160ace45238aee49f39eb13cb702
 2014-08-21 16:24:19 -07:00
George Mount
15da35abec am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit '7f09ecc574a079a6c0b2b7010f78caf61b1ced05':
  Add Parent Change to ChangeTransform
 2014-08-21 23:19:23 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
Igor Murashkin
996020efa9 am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit 'f66338c214b4f74467b3600a3fa3a5254fd9319d':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:45:59 +00:00
George Mount
cd965c6dcf am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'ef21ecd5701dec9d7f40036b51bff42528075304':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:45:55 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Eino-Ville Talvala
edecaee1f2 Camera2: Fix return type of CaptureFailure#getFrameNumber 
Should be long, not int.

Bug: 17188354
Change-Id: If90749f21cdf9dd493aa561769655211a70acf29
 2014-08-21 14:28:50 -07:00
Alan Viverette
9468c6a28e Clean up nullable listeners in date and time picker delegates 
Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.

BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7
 2014-08-21 13:56:54 -07:00
Adam Lesinski
53fc386d5c am b797a064: am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit 'b797a06449db4019b0c1c6ca8fd4b385770c162c':
  Report the right resource version in am get-config
 2014-08-21 20:49:33 +00:00
Matthew Williams
50892518ed am 47d59fb7: am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '47d59fb79d29d590f43be9e26d3cc196cc4aa14f':
  JobScheduler needs to flush queue on charging
 2014-08-21 20:49:27 +00:00