Chet Haase
371d4cccde
am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
...
* commit '339ac85483145972da010ad34cbcb29ed70cb822':
Fix quickReject logic to account for setClipChildren() setting
2013-04-20 21:34:59 -07:00
Selim Gurun
20113c0b4d
am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '940718d8598e4b8da3009b46e8edba9d1dc6ed40':
Revert "Add a delimiter between scheme and host"
2013-04-20 21:34:55 -07:00
Fabrice Di Meglio
b241f60fe7
am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
...
* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-20 21:34:53 -07:00
Christopher Tate
353bd75bba
am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
...
* commit '18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
Provide SharedPreferences coherence guarantees for BackupAgent
2013-04-20 21:34:52 -07:00
Victoria Lease
7e170b6321
am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
...
* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
do not attempt to parcel unknown ParcelableSpans
2013-04-20 21:34:52 -07:00
Dianne Hackborn
5b00f5584a
am b3bffa80: Merge "Follow up on issue #8159072 : Spinner widget should be RTL\'ized" into jb-mr2-dev
...
* commit 'b3bffa8080c4b04285897d18f913cf6385b0e9e1':
Follow up on issue #8159072 : Spinner widget should be RTL'ized
2013-04-20 21:34:51 -07:00
Craig Mautner
70f30d217c
am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
...
* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
Improve javadoc for rotationAnimation.
2013-04-20 21:34:51 -07:00
Chet Haase
339ac85483
Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
2013-04-20 21:02:21 +00:00
Selim Gurun
940718d859
am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:38:31 -07:00
Selim Gurun
a68545796d
am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:35:29 -07:00
Selim Gurun
fa1f7d21e9
am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:32:24 -07:00
Selim Gurun
5fba3404d3
am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '3c4fa654801fcf51a92cefd62e28a020d39e08d0':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:22:01 -07:00
Selim Gurun
3c4fa65480
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:19:41 -07:00
Geremy Condra
464be7975f
am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '30504327364a7ad641c09a227f7930b9fba91614':
Add a delimiter between scheme and host
2013-04-19 23:19:20 -07:00
Geremy Condra
3050432736
am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '62588d794602f6e42e8143169d8ef170589797a1':
Add a delimiter between scheme and host
2013-04-19 23:17:45 -07:00
Geremy Condra
ed1e5a8702
am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit 'b7787a317fc8bb163de04641a1423cd08324d4b8':
Add a delimiter between scheme and host
2013-04-19 21:38:06 -07:00
Fabrice Di Meglio
8c08fc9a86
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
...
- clean BidiFormatter APIs
Change-Id: I8591ce3c3e8f2de4138698aa14ddb38b933de5e1
2013-04-19 17:34:01 -07:00
Chet Haase
dd671599be
Fix quickReject logic to account for setClipChildren() setting
...
The rendering code optimizes by rejecting drawing operations that
lie outside of the bounds of their views. This works in most
situations, but breaks down when containers have called
setClipChildren(false), because we reject drawing that is outside
of that container, but which should be drawn anyway.
Fix is to pass in the value of that flag to the DisplayList drawing
routines which take that flag into account when deciding whether
to quickReject any particular operation.
Issue #8659277 animation clipping
Change-Id: Ief568e4db01b533a97b3c5ea5ad777c03c0eea71
2013-04-19 15:36:37 -07:00
Christopher Tate
18414c4db7
Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
2013-04-19 22:34:02 +00:00
Victoria Lease
bcf3ec96a4
Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
2013-04-19 22:33:43 +00:00
Dianne Hackborn
b3bffa8080
Merge "Follow up on issue #8159072 : Spinner widget should be RTL'ized" into jb-mr2-dev
2013-04-19 22:18:12 +00:00
Dianne Hackborn
f1ae269c06
Follow up on issue #8159072 : Spinner widget should be RTL'ized
...
Only allow through changing direction configs for drawables.
Explicitly map layout direction values to an index in the
preload arrays.
Drawables that don't vary by configuration should go in to both
the rtl and ltr preloads.
Change-Id: Ib92dd11738082a795e02d1d4191adb54702d651c
2013-04-19 14:50:27 -07:00
Craig Mautner
c1876b256c
Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
2013-04-19 21:30:21 +00:00
Christopher Tate
f85f5b2125
Provide SharedPreferences coherence guarantees for BackupAgent
...
SharedPreferences uses deferred writes internally, and the public
API doesn't allow apps to explicitly synchronize with this, so the
backup/restore implementation needs to take a little care to make
sure that the app process isn't killed before the deferred writes
land on disk. This parallels the coherence guarantees around
SharedPreference that the Activity and Service lifecycles provide.
Bug 8659368
Change-Id: I853e54f9fb0d2d260dbe6e40d640959f998092df
2013-04-19 14:30:11 -07:00
Victoria Lease
577ba5354b
do not attempt to parcel unknown ParcelableSpans
...
Bug: 8639983
Change-Id: I27335f6e9d3a0671ecdd161fdbf765785ef8065d
2013-04-19 13:38:34 -07:00
Jeff Sharkey
1b50e4ead5
am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev
...
* commit 'ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7':
Environment should only warn when asked.
2013-04-19 13:35:37 -07:00
Jeff Sharkey
48749fc78a
Environment should only warn when asked.
...
Instead of warning on Process.SYSTEM_UID, which is also used by the
Settings app, change to have the parent process explicitly ask for
warnings.
Bug: 8667286
Change-Id: Ib26676694a4041ff4e6d3ffdcc14055b7eba13c7
2013-04-19 13:27:43 -07:00
Craig Mautner
bdcc9a5811
Improve javadoc for rotationAnimation.
...
Clarified use of rotationAnimation. Did not add a comment
for ROTATION_ANIMATION_CHANGED as that would be inconsistent
with the other twelve <parameter>_CHANGED flags that it
follows in the source code.
Fixes bug 8657715.
Change-Id: I03b5caf3d6a93ca0044f58485c94c7a600e835a8
2013-04-19 13:08:47 -07:00
Amith Yamasani
ba56701493
am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
...
* commit 'e37c8f781abb045ec4a0b872e5e6afe48eee021a':
Improve API and documentation
2013-04-19 12:47:01 -07:00
Carlos Valdivia
f2c12911fb
am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev
...
* commit '58156b4123acf92f2a03885136a3b6859801f000':
Fix NPE when restarting ChooseTypeAndAccountActiivty.
2013-04-19 12:46:59 -07:00
Jeff Sharkey
dde9559b78
am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
...
* commit '24b55f25c18fbed6b5d10ed33ddaab269cf1a01e':
Deprecate StatFs methods returning small values.
2013-04-19 12:46:56 -07:00
Amith Yamasani
e37c8f781a
Merge "Improve API and documentation" into jb-mr2-dev
2013-04-19 19:10:02 +00:00
Amith Yamasani
3b458ad9ee
Improve API and documentation
...
API for querying accounts visible to a specific package.
Improve API and docs for device owner.
Bug: 8657158
Change-Id: I01b8701534f64b383391508a49ae93ed21f22ae0
2013-04-19 12:07:46 -07:00
Carlos Valdivia
58156b4123
Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev
2013-04-19 18:38:34 +00:00
Jeff Sharkey
24b55f25c1
Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
2013-04-19 18:21:09 +00:00
Fabrice Di Meglio
07fedf58dd
am b08aa235: Merge "Improve fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev
...
* commit 'b08aa2354ff3b1bd1c7d705b82a7c1e62674ee50':
Improve fix for bug #8159072 Spinner widget should be RTL'ized
2013-04-19 11:03:28 -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
Fabrice Di Meglio
b08aa2354f
Merge "Improve fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev
2013-04-19 17:58:47 +00: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
Jeff Sharkey
b81440bd9b
Deprecate StatFs methods returning small values.
...
Bug: 8656794
Change-Id: Ic904bd1bc016ef48b5a304b7c68250afe23e98bc
2013-04-19 10:52:42 -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
Carlos Valdivia
1b64c9d315
Fix NPE when restarting ChooseTypeAndAccountActiivty.
...
Note that this change still leaves things in an imperfect state. Now instead
of ANR with an NPE it will reshow the Choose account activity and then on the
second back, it will go away. So the user isn't hosed. But it is still a sloppy
experience. Basically the bug fix reveals another not quite as bad bug
(see https://b/8661942 ).
Bug: 8151602
Change-Id: I44b188f5940d464c2dd81dd0b6b7cae3c189becd
2013-04-19 02:57:42 -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
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
Fabrice Di Meglio
b9a13b892e
Improve fix for bug #8159072 Spinner widget should be RTL'ized
...
- populate the preloaded drawable cache with only LTR drawables
when the layout direction during preloading is LTR. Populate
the cache with only RTL drawables when the layout direction during
preloading is RTL
- only preload drawables that dont have a dual LTR/RTL version
Change-Id: I7807bdc031b99102609efda75042a9500d96065c
2013-04-18 19:57:24 -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