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

32015 Commits

Author SHA1 Message Date
Dianne Hackborn
eadbcd3352 resolved conflicts for merge of 8c3cb811 to master 
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
 2013-04-23 10:56:23 -07:00
Philip Milne
e11d9ed3ec am 089a75be: am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 
* commit '089a75be5e33e13071754a727902224b6db60168':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
 2013-04-23 04:46:31 -07:00
Robert Greenwalt
75a1cac2bf am f12afa99: am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev 
* commit 'f12afa9913ac75af724d9700ff85dc68b1e0cd45':
  Listen for network disconnect.
 2013-04-23 04:46:25 -07:00
Dianne Hackborn
8c3cb8111a am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev 
* commit 'a4629b0b833f78481ca51baa44b0303ebe647a7c':
  JB MR2 == API 18.
 2013-04-23 03:51:40 -07:00
Philip Milne
089a75be5e am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 
* commit 'a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
 2013-04-23 03:51:29 -07:00
Robert Greenwalt
f12afa9913 am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev 
* commit 'd020294572f591007de1fe0aa9e4927dae72c0c9':
  Listen for network disconnect.
 2013-04-23 03:51:08 -07:00
Dianne Hackborn
a4629b0b83 Merge "JB MR2 == API 18." into jb-mr2-dev 2013-04-22 23:37:37 +00:00
Philip Milne
a7b2625d43 Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev 2013-04-22 22:26:21 +00:00
Robert Greenwalt
d020294572 Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Robert Greenwalt
1b0ca9dace Listen for network disconnect. 
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
 2013-04-22 14:13:51 -07:00
Dianne Hackborn
d2eeed635d JB MR2 == API 18. 
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
 2013-04-22 13:28:47 -07:00
Philip Milne
ca2e9e1122 Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets 
GridLayout is working as intended here. The bug is appears to be in RelativeLayout
(and possibly LinearLayout).

The value of RelativeLayout.DEFAULT_WIDTH = Integer.MAX_VALUE/2 is 0x3FFFFFFF has bits
set in the range that is used to flag certain conditions and states by the layout system.

In View we have:

MEASURED_SIZE_MASK = 0x00ffffff
MEASURED_STATE_MASK = 0xff000000;
MEASURED_STATE_TOO_SMALL = 0x01000000

This change fixes this bug, though it looks as if that a safer solution would be to not introduce
this constant and code path in the first place - as RelativeLayout's measurement algorithm operates
in the LTR case without it.

Change-Id: I01c51ae854620f08dd63047594486a3464c86f3a
 2013-04-22 12:58:55 -07:00
Michael Wright
323efd55d3 am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment" 
* commit '076e1f4c560df7db54755b006acbea9b6eba0b76':
  KeyEvent: update comment
 2013-04-20 22:48:08 -07:00
Michael Wright
076e1f4c56 am abc2763e: Merge "KeyEvent: update comment" 
* commit 'abc2763e4587c3326d160f25666e933cc6888884':
  KeyEvent: update comment
 2013-04-20 22:43:56 -07:00
Michael Wright
abc2763e45 Merge "KeyEvent: update comment" 2013-04-21 05:34:28 +00:00
Chet Haase
684634144b am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 
* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting
 2013-04-20 21:37:23 -07:00
Selim Gurun
e8cb9e55b8 am 20113c0b: 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 '20113c0b4dc6f5d6bebaf3175bfc99ce89cc2388':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 21:37:15 -07:00
Fabrice Di Meglio
16cea16570 am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev 
* commit 'b241f60fe76677d106d472d4118d1e6959563331':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text
 2013-04-20 21:37:04 -07:00
Christopher Tate
114f85dcb7 am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev 
* commit '353bd75bbab5904cc872364586acf7eb05b4e264':
  Provide SharedPreferences coherence guarantees for BackupAgent
 2013-04-20 21:36:57 -07:00
Victoria Lease
a5d3459316 am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev 
* commit '7e170b632147da55f93864223419a9f7fa651410':
  do not attempt to parcel unknown ParcelableSpans
 2013-04-20 21:36:55 -07:00
Dianne Hackborn
4c2b007b5e am 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev 
* commit '5b00f5584a7894bb79f9ce369d88cea5d886ff22':
  Follow up on issue #8159072: Spinner widget should be RTL'ized
 2013-04-20 21:36:51 -07:00
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
570e07c790 am 0cf469f2: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev 
* commit '0cf469f21a3df42c204d9569f3d5fe465331b59d':
  Improve javadoc for rotationAnimation.
 2013-04-19 14:38:47 -07:00
Jeff Sharkey
94e602d7b5 am 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev 
* commit '1b50e4ead5463f4dcc03f9c5ed64963af0d4d9eb':
  Environment should only warn when asked.
 2013-04-19 14:38:36 -07:00
Craig Mautner
0cf469f21a am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev 
* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
  Improve javadoc for rotationAnimation.
 2013-04-19 14:32:44 -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