Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,825 Commits 3 Branches 0 Tags
e181320e157fa9fb45e4e847f51583d866dfcc22
Commit Graph

40428 Commits

Author SHA1 Message Date
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
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
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
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
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
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00
Raph Levien
26573425da Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 2014-09-04 23:08:58 +00:00
Dianne Hackborn
edfc6af590 Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 2014-09-04 23:08:24 +00:00
Raph Levien
fb0431b525 Up/down arrow moves to beginning/end of buffer 
With a hardware keyboard, using up arrow within the top line should
move to the beginning of the buffer, to better match desktop text
editing expectations, and similarly for down arrow on the last line.
This patch implements that behavior.

Bug: 17385784
Change-Id: Ia23c23c9cc2462558bca9aaffec7d83e284d55e8
 2014-09-04 15:03:14 -07:00
Craig Mautner
7a629c2d04 Update API per council request 
A few protected => public changes and picking up another change
in ViewAnimationUtils that got missed.

Fixes bug 17389511.

Change-Id: I75027535eade6427c2d9067369426297c168e77e
 2014-09-04 14:57:04 -07:00
Andreas Gampe
82ad9ec3d1 am 523afd15: Merge "Frameworks/base: Add native bridge post-fork initialization" 
* commit '523afd157be99ddce8c0f643caceb9db4a9227bb':
  Frameworks/base: Add native bridge post-fork initialization
 2014-09-04 21:55:34 +00:00
Dianne Hackborn
521e4bd7c5 Fix issue #17375172... sshhhhhh!!! 
Change-Id: Idf3eafe829418bfc29e31f893ae6cff249488ffa
 2014-09-04 14:50:26 -07:00
Robert Greenwalt
70e41aac60 am db613a0f: am ca6b015f: Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev 
* commit 'db613a0fa90227a742682ea7d621c0f6ec264bc0':
  Catch creation of NetworkRequest without NetCap
 2014-09-04 21:26:09 +00:00
Chris Craik
600dc4393a am 323e213d: am b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 
* commit '323e213d0aff4e4120ce183ac4c38d63b593ecee':
  Prioritize reveal clipping over Outline clipping
 2014-09-04 21:26:02 +00:00
David Christie
25fb15035b am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit 'd3a78eff9d1a34f4638ddfdb6b1f3519b10426b7':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:17:20 +00:00
Alan Viverette
f97d540026 am 2bb0dec5: am 69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 
* commit '2bb0dec5fb6e4e1d112bbbea7ce59ae0d6b9127a':
  Fix AM/PM text i18n and clean up keyboard support in time picker
 2014-09-04 21:17:05 +00:00
Alan Viverette
b053e16027 am 83a9b505: am cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 
* commit '83a9b505f452c4518f445540d1b3059d52775507':
  Fix clip rect when drawing accessibility focus rect
 2014-09-04 21:17:01 +00:00
Raph Levien
01fb255d78 am f7380a69: am 58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev 
* commit 'f7380a6978d3f5b848df277fb23fbc544e148e61':
  Fix Layout.isRtlCharAt
 2014-09-04 21:16:52 +00:00
Robert Greenwalt
d35d826fb5 Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev 2014-09-04 21:08:11 +00:00
Chris Craik
2d3f9033f8 Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev 2014-09-04 21:06:10 +00:00
Chris Craik
e83cbd4518 Prioritize reveal clipping over Outline clipping 
bug:15780987
bug:17350602

Also update docs around clipping nesting behavior,
and some Z ordering behavior.

Change-Id: Iaa204350a0adfdcbd8c4b821fb4a9c0ae22f2613
 2014-09-04 14:05:10 -07:00
Adam Lesinski
32962bbccf am 9d54107e: am 0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev 
* commit '9d54107ef3aa5e31fe96a7465fbb9816e2f747d7':
  Add Configuration changes to UsageStats
 2014-09-04 21:04:37 +00:00
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore. 
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 20:53:21 +00:00
Alan Viverette
3b256c850c Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev 2014-09-04 20:45:12 +00:00
Alan Viverette
c65e9a480a Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev 2014-09-04 20:44:38 +00:00
Raph Levien
37d611198f Merge "Fix Layout.isRtlCharAt" into lmp-dev 2014-09-04 20:40:45 +00:00
Adam Lesinski
430f5680b6 Merge "Add Configuration changes to UsageStats" into lmp-dev 2014-09-04 20:35:51 +00:00
Jason Monk
9373e7acd7 am f8c1c23f: am f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev 
* commit 'f8c1c23f35d5d89624c45f137ac5a0f711f998b4':
  Proxy fixes from API review feedback
 2014-09-04 20:12:31 +00:00