Commit Graph

29505 Commits

Author SHA1 Message Date
Fabrice Di Meglio
7ed5180df7 am 1c6e609b: am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev
* commit '1c6e609b2b5409b34d5928f506306ed9ad21adb7':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft
2013-04-19 11:03:15 -07:00
Fabrice Di Meglio
1c6e609b2b am 2623a24f: Merge "Fix bug #8654490 android:paddingStart doesn\'t override android:paddingLeft" into jb-mr2-dev
* commit '2623a24ffa4d75206757684b12b06318167f8788':
  Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft
2013-04-19 10:59:51 -07:00
Philip Milne
1027ea4743 am 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
* commit '696b15e52659abdf8852dc60f09fe79edba435e0':
  Revert "Simple MVC based binding mechanism for android controls."
2013-04-19 10:59:43 -07:00
Philip Milne
696b15e526 am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
* commit '68711f936381310fad783f2500e59dc2f272618a':
  Revert "Simple MVC based binding mechanism for android controls."
2013-04-19 10:56:22 -07:00
Fabrice Di Meglio
2623a24ffa Merge "Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft" into jb-mr2-dev 2013-04-19 17:56:22 +00:00
Philip Milne
68711f9363 Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev 2013-04-19 17:53:24 +00:00
Robert Greenwalt
ca2dc0d763 am 0460cb9e: am 88cec86e: Remove STOPSHIP and defer removal.
* commit '0460cb9ed68bbd612c46c52b5f17e58d31cc5125':
  Remove STOPSHIP and defer removal.
2013-04-19 10:20:35 -07:00
Robert Greenwalt
0460cb9ed6 am 88cec86e: Remove STOPSHIP and defer removal.
* commit '88cec86e882e27a9e35315553cc05fdf7f281a4e':
  Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
88cec86e88 Remove STOPSHIP and defer removal.
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00
Philip Milne
ab104ba6d4 Revert "Simple MVC based binding mechanism for android controls."
Fix for bug 8656899 API REVIEW:
	android.util.PropertyValueModel/ValueModel,
	android.widget.ValueEditor etc

Revert the change that added this API to remove it outright.

This reverts commit 989709a973

Change-Id: I9018cd8dadb1b1a54ad8749c816bd02bb7e7a38b
2013-04-18 21:09:00 -07:00
Ying Wang
11915d14d7 am 9454a9b3: am 4e0eb22f: Fix doc build.
* commit '9454a9b3037dfdd172e08d621a23df182bf942b4':
  Fix doc build.
2013-04-18 20:47:44 -07:00
Ying Wang
9454a9b303 am 4e0eb22f: Fix doc build.
* commit '4e0eb22fdf56b8f3fd1bff09c4064b35b80751c1':
  Fix doc build.
2013-04-18 20:44:28 -07:00
Ying Wang
4e0eb22fdf Fix doc build.
Change-Id: Ibf0d998721a2851c31529d5b44bf86b1b3df5791
2013-04-18 20:39:48 -07:00
Jeff Brown
1345bf762b am 31ae3908: am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev
* commit '31ae3908fb6d4eccc04920ddaff557b76110fe30':
  Undeprecate old UsbDeviceConnection methods.
2013-04-18 19:22:33 -07:00
Svetoslav Ganov
aff9c7652e am 8a28c2c2: am d1f765c0: Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev
* commit '8a28c2c2a02c389f3702af9678fa419f2d3c86d7':
  Fix restoration of virtual accessibility focus in ListView.
2013-04-18 19:22:30 -07:00
Jeff Brown
31ae3908fb am 8adf5d2b: Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev
* commit '8adf5d2b0d3c59e085837159173c3228061ce3e7':
  Undeprecate old UsbDeviceConnection methods.
2013-04-18 19:20:22 -07:00
Svetoslav Ganov
8a28c2c2a0 am d1f765c0: Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev
* commit 'd1f765c009ec28484792b9d847fa0c41e6b943e0':
  Fix restoration of virtual accessibility focus in ListView.
2013-04-18 19:20:19 -07:00
Jeff Brown
8adf5d2b0d Merge "Undeprecate old UsbDeviceConnection methods." into jb-mr2-dev 2013-04-19 02:19:34 +00:00
Jeff Brown
e783d99038 Undeprecate old UsbDeviceConnection methods.
Per api review, retain the overloads that do not accept a
buffer start offset.

Bug: 8656781
Change-Id: Ie00aca7d3a4708700c5ddf60e3309e609788a67f
2013-04-18 19:17:35 -07:00
Svetoslav Ganov
d1f765c009 Merge "Fix restoration of virtual accessibility focus in ListView." into jb-mr2-dev 2013-04-19 02:17:02 +00:00
Jeff Brown
8844892a88 am ba8fdcac: am 6f575bb3: Merge "Fix change of behavior in Looper.quit()." into jb-mr2-dev
* commit 'ba8fdcac4cc4ae3d9dcac8fa6a64c55facd6f25f':
  Fix change of behavior in Looper.quit().
2013-04-18 19:14:54 -07:00
Jeff Brown
ba8fdcac4c am 6f575bb3: Merge "Fix change of behavior in Looper.quit()." into jb-mr2-dev
* commit '6f575bb34c038bfa0e3cd0e26e61712d7fdcb984':
  Fix change of behavior in Looper.quit().
2013-04-18 19:11:44 -07:00
Jeff Brown
6f575bb34c Merge "Fix change of behavior in Looper.quit()." into jb-mr2-dev 2013-04-19 02:09:20 +00:00
Jeff Brown
8b60e45147 Fix change of behavior in Looper.quit().
It seems some applications rely on Looper.quit() terminating the
loop immediately without processing all messages.  Rather than
risk breaking them, make the safer behavior optional.

Also take care to properly drain the message queue before quitting
so that all of the Message instances are recycled.  This may
help release storage sooner in case the Looper doesn't get GC'd
promptly and its remaining queue of undelivered messages sticks
around.

Improve docs on runWithScissors.

Bug: 8596303
Change-Id: I8cbeb6f7a5f6b8e618b5109f87a03defc1486b9f
2013-04-18 19:04:39 -07:00
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
Fabrice Di Meglio
1ae3b6aedd Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft
- in RTL mode only and if you have left/start or right/end at the same time,
the initial left/right padding (coming from the background drawable or from
some explicit definition) was still used.

- now, override the background left/right initial pading by the left/right one
only and only if there is no start/end padding defined at the same time
(because when start/end are defined, we do not care about left/right padding
except the background ones)

Change-Id: Icc6e69c95ace1307b0c5e9673cbdf3b611b62733
2013-04-18 18:23:01 -07: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
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
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
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