Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,922 Commits 3 Branches 0 Tags
0a6f664ff2e66d2121c74564806a74382c8caab4
Commit Graph

41037 Commits

Author SHA1 Message Date
George Mount
0a6f664ff2 am b7c6a799: am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit 'b7c6a7990a59a70ab1876f7e6a1322a92fbcc4ed':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:55:47 +00:00
George Mount
e4bf22a740 am 6629a210: am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit '6629a21012a09b30ba50446aa9fdf901d803afd9':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:55:42 +00:00
George Mount
729aa5b2b6 am a538aac4: am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit 'a538aac40e100719fbcfd24b87aab48e29ae31eb':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:55:20 +00:00
Martin Kosiba
87396dae15 am 4b9fd335: am f5969458: am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev 
* commit '4b9fd3354d3bcc033060b118cf5b109996b1e626':
  Change WebView.zoomBy return type to void.
 2014-09-05 15:55:04 +00:00
Winson Chung
30618384f6 am 3407514f: am 69c8df27: am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '3407514fb9a96f9a32451f1bbc9892e070375262':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:54:58 +00:00
Kenny Guy
8ebc2f1a0d am b14b98f6: am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit 'b14b98f6a1828f26f23d678e43fb32d1d86eea66':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:54:37 +00:00
George Mount
efc1799234 am 86d466b3: am b555f0cf: Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 
* commit '86d466b324a31117e5da230b04f165b3b1fa4665':
  Fix selection of epicenter in Activity Transitions.
 2014-09-05 15:45:08 +00:00
George Mount
3ea1ea4683 am f43c2592: am da6df616: Merge "Fix NPE when Window disappears during a transition." into lmp-dev 
* commit 'f43c2592fc4ca83cc5274836fa4fcbc6bac956fb':
  Fix NPE when Window disappears during a transition.
 2014-09-05 15:45:01 +00:00
George Mount
02d882ee43 am e389d9d0: am 47229456: Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 
* commit 'e389d9d001510346ff743f4e5fd0279a37551c9e':
  API Review: Change SharedElementListener to SharedElementCallback.
 2014-09-05 15:44:40 +00:00
Martin Kosiba
e181320e15 am f5969458: am c3ec88fd: Merge "Change WebView.zoomBy return type to void." into lmp-dev 
* commit 'f59694580f658512bea7d7b26cce541dafae603a':
  Change WebView.zoomBy return type to void.
 2014-09-05 15:44:27 +00:00
Winson Chung
e5ab65d614 am 69c8df27: am 927df1c2: Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 
* commit '69c8df2791e67f7ecf2c35f0ce2e548dfbc4ea02':
  Generalizing Recents widget category to Search box. (Bug 17334589)
 2014-09-05 15:44:22 +00:00
Kenny Guy
cc8b8e8e0e am cc3fa1ef: am 42484d43: Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 
* commit 'cc3fa1ef5c5058d352dbf9d22141fa12d763e106':
  Fix RemoteViews to inflate views for current user.
 2014-09-05 15:44:00 +00:00
Adam Powell
f514df8d19 am 06515e28: am ce9978b5: am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev 
* commit '06515e283887946a8131dd93828cfcc36e13920c':
  Menu callbacks for ToolbarActionBars, part 2
 2014-09-05 15:33:29 +00:00
Craig Mautner
f25a0c2ced am 7dfb0390: am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit '7dfb0390a83b79cbdc334e19f03b1da790871943':
  Update API per council request
 2014-09-05 15:33:16 +00:00
George Mount
ffd09aed4e Merge "Fix selection of epicenter in Activity Transitions." into lmp-dev 2014-09-05 14:14:53 +00:00
George Mount
c2d66a0282 Merge "Fix NPE when Window disappears during a transition." into lmp-dev 2014-09-05 14:14:40 +00:00
George Mount
88dcd1a5f7 Merge "API Review: Change SharedElementListener to SharedElementCallback." into lmp-dev 2014-09-05 13:55:35 +00:00
Martin Kosiba
76c9742862 Merge "Change WebView.zoomBy return type to void." into lmp-dev 2014-09-05 13:44:34 +00:00
Martin Kosiba
3a82acdbf6 Change WebView.zoomBy return type to void. 
It turns out that the semantics of the return value are confusing
and so we decided to not return a result from this method at all.
The developer can call canZoomIn/canZoomOut to determine whether
the WebView is at the zoom limit, so there is no loss of
functionality.

BUG: 17374808
Change-Id: I4dfde71d5ac4a3f91c8755b257411aad06a1b1f6
 2014-09-05 13:41:48 +00:00
Winson Chung
acdc602f18 Merge "Generalizing Recents widget category to Search box. (Bug 17334589)" into lmp-dev 2014-09-05 13:41:40 +00:00
Kenny Guy
da3af8fe1b Merge "Fix RemoteViews to inflate views for current user." into lmp-dev 2014-09-05 11:19:01 +00:00
Adam Powell
a46bdef5a8 am ce9978b5: am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev 
* commit 'ce9978b5fed0f941bf3613910d58c3d1538660b0':
  Menu callbacks for ToolbarActionBars, part 2
 2014-09-05 04:26:05 +00:00
Craig Mautner
3ba54fc40a am b8479376: am d5bb6256: Merge "Update API per council request" into lmp-dev 
* commit 'b8479376f734f714ae2f94d1d5b1536b34b04260':
  Update API per council request
 2014-09-05 04:25:53 +00:00
Adam Powell
a672a7c5ca Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev 2014-09-05 02:40:19 +00:00
Adam Powell
c461250424 Menu callbacks for ToolbarActionBars, part 2 
Pass through the menu mode change events and make sure Activities get
prepare/open/close events properly.

Bug 17326424

Change-Id: I0ac2f56e4d0054ef01720b2ff1c41ded053750c7
 2014-09-04 19:16:39 -07:00
Craig Mautner
f634c08b57 Merge "Update API per council request" into lmp-dev 2014-09-05 01:33:31 +00:00
Adam Powell
1e5a32a667 am 8e879792: am f34ce09c: am 2e9f1521: Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 
* commit '8e8797922674ef46f048690aa2f597d2e0511568':
  Dispatch more menu events to window callbacks from ToolbarActionBar
 2014-09-05 00:52:00 +00:00
Adam Powell
c8ea30e87f am b9949436: am c947bffa: am 5a01e292: Merge "Material EdgeEffect refinements" into lmp-dev 
* commit 'b994943658bb16524458509eead12134cf124878':
  Material EdgeEffect refinements
 2014-09-05 00:51:53 +00:00
Yorke Lee
085146635a am 515f49b3: am 159a547b: am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '515f49b3f34ac3ebe768ab005e9d439886bde921':
  ContactsContract API changes per API review
 2014-09-05 00:51:48 +00:00
Adam Powell
7701884dd0 am f34ce09c: am 2e9f1521: Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 
* commit 'f34ce09c34591d16eb1cdf82fb4cb9af6855ffce':
  Dispatch more menu events to window callbacks from ToolbarActionBar
 2014-09-05 00:41:01 +00:00
Adam Powell
e67efe66b9 am c947bffa: am 5a01e292: Merge "Material EdgeEffect refinements" into lmp-dev 
* commit 'c947bffac6d9c0778eb63a2a183fe963695d07f2':
  Material EdgeEffect refinements
 2014-09-05 00:40:56 +00:00
Yorke Lee
5264e3b9f4 am 159a547b: am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '159a547b246577ac5b02ab2284adc553ed3721b9':
  ContactsContract API changes per API review
 2014-09-05 00:40:51 +00:00
Adam Powell
e50a26f3d8 Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 2014-09-05 00:26:30 +00:00
Adam Powell
1e7b18188c Merge "Material EdgeEffect refinements" into lmp-dev 2014-09-05 00:24:58 +00:00
Yorke Lee
2c404b1e5d Merge "ContactsContract API changes per API review" into lmp-dev 2014-09-05 00:20:07 +00:00
Jungshik Jang
d185bf2313 am 52096d3d: am e2f5c86a: am d427ee65: Merge "CEC: Revamp volume control action." into lmp-dev 
* commit '52096d3dd5c7b060c77c40e6ad439cda07b0ae78':
  CEC: Revamp volume control action.
 2014-09-05 00:18:58 +00:00
Jungshik Jang
9eb3b9bdd2 am e2f5c86a: am d427ee65: Merge "CEC: Revamp volume control action." into lmp-dev 
* commit 'e2f5c86a01cc328add6750118ee16f0e7f52e3ec':
  CEC: Revamp volume control action.
 2014-09-05 00:07:51 +00:00
Adam Powell
710c456ddb Material EdgeEffect refinements 
Add back auto-recede for EdgeEffect, but with a longer delay. Removing
it caused compatibility issues in existing custom views that never
call onRelease. The longer delay will be a signal that something is
amiss without disrupting the UX too badly.

Recede the glow more quickly on release.

Start translucent and fade to more opaque as the glow grows and is
pulled further. Make the opacity stronger in the extreme cases so the
glow is more prominent.

Equalize glow size across the width and height.

Bug 15146438
Bug 15936708

Change-Id: I020d705906e6225b044d0f5303bafa733a679a66
 2014-09-04 17:03:43 -07:00
Yorke Lee
78814623e0 ContactsContract API changes per API review 
Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c
 2014-09-04 16:51:53 -07:00
Jungshik Jang
f4df7656b9 Merge "CEC: Revamp volume control action." into lmp-dev 2014-09-04 23:47:03 +00:00
Raph Levien
fa22262ed2 am a5c45276: am 188d9adb: am 43012fec: Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 
* commit 'a5c452769069bc21c9c8d29fb28dbfa371f6e81b':
  Up/down arrow moves to beginning/end of buffer
 2014-09-04 23:42:11 +00:00
Dianne Hackborn
0db575d3cc am 430f7a2a: am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit '430f7a2a20580f3f7ecfddb3dd3b28e22849852f':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:42:05 +00:00
George Mount
c6186bffe4 Fix selection of epicenter in Activity Transitions. 
Bug 17393451

Change-Id: Ibbcdc104ef3193fe8ce11fa27799801ea7e73986
 2014-09-04 16:33:59 -07:00
Jungshik Jang
2e8f1b6399 CEC: Revamp volume control action. 
Here is a list of changes
1. Change volume control into event base not level base
2. Hide volume ui if volume change is triggered by CEC
3. Report volume change triggered by CEC in OSD message
4. Revamp HdmiLogger so that normal class uses static method only.
5. Apply format message to HdmiLogger's helper methods.

Bug: 17367215

Change-Id: I9f3cd41f7c66f76919059b463df956ed5176b054
 2014-09-05 08:30:19 +09:00
Raph Levien
bc196429d6 am 188d9adb: am 43012fec: Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 
* commit '188d9adb89082eb00a764a51484238bd2a94f89b':
  Up/down arrow moves to beginning/end of buffer
 2014-09-04 23:30:16 +00:00
Dianne Hackborn
7d26fa32cc am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit '8dd4914ba3ece4e408571cfcc19da4d801cecbfa':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:30:11 +00:00
Adam Powell
04c0d46078 Dispatch more menu events to window callbacks from ToolbarActionBar 
Wire through the callbacks that result in onPrepareOptionsMenu being
called properly when an activity overflow menu is opened.

Bug 17326424

Change-Id: Ifc5b67af0d215f210bb00326f82f60ba55a36d52
 2014-09-04 16:25:26 -07:00
Andreas Gampe
c9ee16c3b5 am 3c34df69: Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit '3c34df69f398a540926854a4a27ffe8927e1a6db':
  Frameworks/base: Add native bridge post-fork initialization
 2014-09-04 23:22:05 +00:00
George Mount
6e7fb60b93 Fix NPE when Window disappears during a transition. 
Bug 17343866

Change-Id: I421a28e833ecb78cd542f3f6a728ac87b65ef832
 2014-09-04 16:20:20 -07:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00