Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,107 Commits 3 Branches 0 Tags
9df0fb3c8d80f492cf2ed23c437e7b2f4fdc923f
Commit Graph

31915 Commits

Author SHA1 Message Date
Dianne Hackborn
9df0fb3c8d am a4430894: am f06396da: Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 
* commit 'a44308945ee23ab0ffca80f71c3f8897510a73f1':
  Fix issue #8656537: API review: styles, assist
 2013-04-18 18:34:02 -07:00
Dianne Hackborn
a44308945e am f06396da: Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 
* commit 'f06396dae8ad9f6ac2ca2a6afb459f0e106cd786':
  Fix issue #8656537: API review: styles, assist
 2013-04-18 18:30:02 -07:00
Dianne Hackborn
f06396dae8 Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 2013-04-19 01:26:57 +00:00
Svetoslav
5c0bd520b8 am ab3f5903: am 688a6977: Replacing accessibility service permissions with capability attributes. 
* commit 'ab3f5903fc4cefbaed6c5cf2242703d56f80028e':
  Replacing accessibility service permissions with capability attributes.
 2013-04-18 18:05:27 -07:00
Svetoslav
ab3f5903fc am 688a6977: Replacing accessibility service permissions with capability attributes. 
* commit '688a6977cf7673ed0542ab3d839053c4e38a4dbd':
  Replacing accessibility service permissions with capability attributes.
 2013-04-18 18:01:34 -07:00
Svetoslav
688a6977cf Replacing accessibility service permissions with capability attributes. 
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.

This change adds capability attributes to the accessibility service's
meta-data XML file. The service has to declare the capability and when
it is enabled we show the user the capabilities in the warining dialog.

bug:8633951

Change-Id: Id3442dc71dad018e606888afdc40834682fdb037
 2013-04-18 17:45:44 -07:00
Eino-Ville Talvala
2661bbd219 Merge "Camera: Add hidden camera preview to renderscript allocation API" 2013-04-18 22:44:47 +00:00
Dianne Hackborn
f977201257 Fix issue #8656537: API review: styles, assist 
Change-Id: I5542fb548805fc885b51a1dd1133a3ac226df96b
 2013-04-18 15:35:16 -07:00
Satoshi Kataoka
a1d7a123c4 am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 
* commit 'f09993ca1d01823f9c60c0be45a8169e09dd27d7':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
 2013-04-18 15:32:50 -07:00
Satoshi Kataoka
f09993ca1d am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 
* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
 2013-04-18 15:28:18 -07:00
Adam Powell
4173a89d12 am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 
* commit '61a826eff10c4b275a9569a0edd6301924a6d4e7':
  Fix ActionBar#setHomeActionContentDescription(0)
 2013-04-18 14:50:42 -07:00
Adam Powell
61a826eff1 am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 
* commit '70e376964be45525f1f0e90f35570415dce6d1df':
  Fix ActionBar#setHomeActionContentDescription(0)
 2013-04-18 14:46:17 -07:00
Alon Albert
82d11c847e am d2b8cd75: am adff8b75: Merge "Add Javadoc" into jb-mr2-dev 
* commit 'd2b8cd75ed4ec9d9076699792bd78152885e304f':
  Add Javadoc
 2013-04-18 14:43:40 -07:00
Adam Powell
70e376964b Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 2013-04-18 21:42:22 +00:00
Alon Albert
d2b8cd75ed am adff8b75: Merge "Add Javadoc" into jb-mr2-dev 
* commit 'adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
  Add Javadoc
 2013-04-18 14:39:25 -07:00
Alon Albert
adff8b7577 Merge "Add Javadoc" into jb-mr2-dev 2013-04-18 21:36:33 +00:00
Alon Albert
d35bf1f5eb Add Javadoc 
Bug: 8657225
Change-Id: Id3cc191ea67011460604a691214b9b09075c5938
 2013-04-18 14:28:38 -07:00
Matthew Xie
53302fcc8a am bf3e7d9e: am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 
* commit 'bf3e7d9efceb7b4232c5cc6f4dd2e2ea25e0f714':
  Remove BluetoothAdapterCallback. Simplify leScan Api
 2013-04-18 14:07:04 -07:00
Matthew Xie
bf3e7d9efc am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 
* commit 'b2df0b60d0995c760fc7ee3776caa0fc7f84066a':
  Remove BluetoothAdapterCallback. Simplify leScan Api
 2013-04-18 14:03:55 -07:00
Matthew Xie
b2df0b60d0 Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 2013-04-18 20:59:43 +00:00
Adam Powell
2eeb419e55 Fix ActionBar#setHomeActionContentDescription(0) 
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.

Bug 8657256

Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
 2013-04-18 13:56:22 -07:00
Chet Haase
341a31b107 Merge "First draft of Scenes & Transitions feature" 2013-04-18 20:38:17 +00:00
Chet Haase
faebd8f079 First draft of Scenes & Transitions feature 
This checkin has preliminary API (in flux, definitely changes still
to be made) and implementation for a new "Scenes & Transitions" feature.
The current implementation allows you to define different Scenes
(via layout resource IDs or callbacks) and Transitions to be used when
changing to those scenes. By default, scene changes will use AutoTransition,
which generally does the right thing.

There are no overview docs or tutorials yet. The best way to learn how things
work is to see the code for the various tests in
frameworks/base/tests/TransitionTests.

Expect the API to change. Expect the implementation to change (mostly to add
more functionality). Expect bugs, but tell me if things do not work
as expected.

Change-Id: Ib025a9f565678b225afa4759325cf6d496cc7215
 2013-04-18 13:33:13 -07:00
Satoshi Kataoka
1a546dca77 Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 2013-04-18 17:43:38 +00:00
John Spurlock
600cba973f Input-related documentation fixes. 
Fix a few typos in InputFilter.  Fix reference in InputEvent currently
causing public documentation breakage.

Change-Id: I6268ad165f11d4d9d5a4a66ed97f1538e174cf84
 2013-04-18 08:53:56 -04:00
Jaikumar Ganesh
032aeafd68 am d5af1724: am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit 'd5af1724500f42e389cc2b8a0be9bacdf53405ad':
  Hardware geofence API changes.
 2013-04-17 22:25:18 -07:00
Jaikumar Ganesh
d5af172450 am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
 2013-04-17 22:21:32 -07:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes. 
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
 2013-04-17 22:18:01 -07:00
Matthew Xie
cdd94e3647 Remove BluetoothAdapterCallback. Simplify leScan Api 
App does not need to explicitly register/unregister callback
bug 8599881

Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
 2013-04-17 20:49:33 -07:00
Mathias Agopian
b35fbd5720 am 740cf4ec: am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit '740cf4ec31b8d7363c9a0f839afda3d8cb0ab9a3':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:36:08 -07:00
Eino-Ville Talvala
7005b67c12 Camera: Add hidden camera preview to renderscript allocation API 
- Camera.createPreviewAllocation() creates YUV allocations for use as
  a preview buffer destination.

- Camera.setPreviewCallbackAllocation() sets such an allocation as the
  target for preview data from camera.

Bug: 8563840
Change-Id: Ie42033976fed825d396550bbc033d434c8206b6b
 2013-04-17 18:35:26 -07:00
Mathias Agopian
740cf4ec31 am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 
* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
 2013-04-17 18:32:24 -07:00
Mathias Agopian
bb7b315cdd Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev 2013-04-18 01:29:07 +00:00
Chet Haase
68293ecb91 am 78296cb7: am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit '78296cb760bff8bf951e88d6f4ec9a6ff3059406':
  Fixes for setClipBounds()
 2013-04-17 15:54:52 -07:00
Chet Haase
78296cb760 am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev 
* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
 2013-04-17 15:49:17 -07:00
Craig Mautner
61cc1b632a Merge "Steady improvement to multi stack." 2013-04-17 22:35:02 +00:00
Chet Haase
bc09a364c3 Merge "Fixes for setClipBounds()" into jb-mr2-dev 2013-04-17 22:13:50 +00:00
Mathias Agopian
9ddf32aa8a add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}() 
Bug: 8593591
Change-Id: I152281ddca8716aee97147cb1b3fb483ed46b053
 2013-04-17 15:04:47 -07:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:23:01 -07:00
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Adam Cohen
f4865efe60 am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:06:33 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Craig Mautner
29219d963d Steady improvement to multi stack. 
- Fix back button behavior with two stacks. Stopping activities were
held in that state indefinitely. This change causes IDLE_NOW_MSG to
be sent immediately for the last activity in a stack.

- Touch in non-focused stack was being ignored because of focus tests
in AbsListView.

- Change the focused stack when the activity focus changes. Renamed
mMainStack to mFocusedStack to reflect this.

- Resume all top stack activities when resuming.

- Assign intent task to ActivityRecord if it doesn't have a task.
Fixes bug 8433463.

Change-Id: I8d3c806234511697bc209ab99890730ffa514d20
 2013-04-17 13:54:48 -07:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00