27609 Commits

Author SHA1 Message Date
Adam Cohen
3b4ca103f8 Fix docs build issue
Change-Id: I901e5b80609bf5ae85b167ec01b7507714423e5c
2012-12-14 12:00:56 -08:00
Adam Cohen
50f3d1bae8 Adding simple ArrayList API for collection widgets
Change-Id: I4d6c909d1d2c0bdd1ddc8329445cea0e78a5ce7c
2012-12-13 14:52:30 -08:00
Adam Powell
7da613fd5d am a52b4792: am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit 'a52b4792d134c257d0e897dbd39e6c1a53e30bb5':
  Fix EventLog string class problem in onOptionMenuSelected
2012-12-10 11:43:33 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
2012-12-10 11:41:29 -08:00
Adam Powell
ba534dece2 Merge "Update documentation to mention compatibility versioning" 2012-12-10 11:34:19 -08:00
Adam Powell
2c8cc972c3 Update documentation to mention compatibility versioning
Mention changes involving MeasureSpec/RelativeLayout/ImageView
behavior changes when apps target SDK > 17.

Change-Id: I232492a76ac048f7b460d28a87bd84cbbec4e4d7
2012-12-10 11:02:54 -08:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
2012-12-10 23:19:45 +09:00
Satoshi Kataoka
6d29d143d9 Merge "Fix an issue on changing the keyboard locale between spellchecking supported language to non-supported language" 2012-12-09 17:34:41 -08:00
Adam Powell
e3833c2ba4 Merge "Compatibility measurement hacks when targetSdkVersion <= JB-MR1" 2012-12-07 17:23:24 -08:00
Adam Powell
7da4b73a23 Compatibility measurement hacks when targetSdkVersion <= JB-MR1
All three of these are interrelated!

* Allow broken MeasureSpec values. The long-standing implementation
  of MeasureSpec.makeMeasureSpec has been to add both values rather
  than masking/or-ing the values together. Some old code relied on
  this, such as if it mixed up size/mode params.

* Disable ImageView adjustViewBounds allowing the view to grow beyond
  its initial size. A bug in RelativeLayout in the presence of the
  above MeasureSpec fix causes this not to work properly in apps.

* Allow RelativeLayout to send overflowed/bogus MeasureSpec values
  when measured with MeasureSpec.UNSPECIFIED mode. Some apps have
  custom child views that do not properly handle UNSPECIFIED
  measurements, but the exact overflow semantics caused this to
  generate AT_MOST $REALLYBIG MeasureSpecs for those views instead if
  they were placed inside a RelativeLayout in a scrolling container.

Change-Id: I977a5f1ba5637f0cba3d26a70139e2bcd021fc9c
2012-12-07 16:30:35 -08:00
Sascha Prueter
961ce2afbf am 2588648b: am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '2588648b5268526bdc9ed7fb4e9eac36c8c693dc':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
2012-12-07 12:40:32 -08:00
Sascha Prueter
2588648b52 am 203f69f0: Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev
* commit '203f69f0998d982205b1c9f550576024654e6bc3':
  Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
2012-12-07 12:38:15 -08:00
Adam Powell
cd252d267b am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables"
* commit '524962c8cf796035f7578515ba48080873d46057':
  Framework: Use holo alert drawables
2012-12-07 12:24:20 -08:00
Adam Powell
461c8534e1 am d9cb3c53: am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached"
* commit 'd9cb3c538f034c4e5137a2d2827cc72f8fbaf67e':
  Ensure running mTouchModeReset when AbsListView is detached
2012-12-07 12:24:17 -08:00
Adam Powell
524962c8cf am ff411ddb: Merge "Framework: Use holo alert drawables"
* commit 'ff411ddb40d250f075bfe8c4940931b27079f5cb':
  Framework: Use holo alert drawables
2012-12-07 12:21:41 -08:00
Adam Powell
d9cb3c538f am 8ea5ce15: Merge "Ensure running mTouchModeReset when AbsListView is detached"
* commit '8ea5ce15651ebc1249a3b80531773b37e6f49b8d':
  Ensure running mTouchModeReset when AbsListView is detached
2012-12-07 12:21:37 -08:00
Craig Mautner
4abf3f987f Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE
RecentsActivity screenshots are called for very quickly after
WindowStateAnimator prepareSurface(). Without enough delay the
Surface.setLayer call does not propagate to the SurfaceFlinger
and the screenshot is incorrect (black) because it stops sampling
the layers too early.

This fix calls Surface.setSize() for each sampled Surface in
screenshots. setSize forces the SurfaceFlinger to process all
transactions queued before returning from closeTransaction.

Bug 7552304 fixed.

Change-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df

Conflicts:

	services/java/com/android/server/wm/WindowManagerService.java
2012-12-07 11:21:35 -08:00
Adam Powell
ff411ddb40 Merge "Framework: Use holo alert drawables" 2012-12-07 11:20:08 -08:00
Robert Greenwalt
4c8b7481cf Fix javadoc break
Change-Id: Ia69a5cbead61747537269e267dcd8da320d61ba3
2012-12-07 09:56:50 -08:00
Robert Greenwalt
37b8dfbade Merge "Refactor getPersistedNetworkPreference" 2012-12-07 09:09:06 -08:00
Sangkyu Lee
a607223f34 Ensure running mTouchModeReset when AbsListView is detached
mTouchModeReset should be executed when AbsListView is detached from window.
If not, when the AbsListView is re-attaced to window,
the child can retain a pressed state.

You can see this problem easily when you double-touch an item of
option menu very quickly.

Change-Id: I5aaa1fd5b95847efb2f5f1b5ec7cabe8eb85b237
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
2012-12-07 17:06:15 +09:00
Daniel Sandler
e762482866 am b38ecce2: am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit 'b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd':
  Fix longstanding nonsense in javadocs.
2012-12-06 23:22:40 -08:00
Adam Cohen
2f536b18c4 am b9376280: am 224d2225: am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
* commit 'b93762809beb13f61c6b2f7cb908a4ce81f46c82':
  Making sure to clear state related to views that are being recycled (issue 7650538)
2012-12-06 23:22:37 -08:00
Fabrice Di Meglio
aae6b552b3 am 7ee2f778: am 09329186: am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
* commit '7ee2f7785f3f77a4d4f589fe6a488662c9ad7913':
  Fix bug #7649607 Hebrew text is cut off in Settings
2012-12-06 23:22:31 -08:00
Craig Mautner
ca3088cee8 am 29d4484d: am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev
* commit '29d4484dd822d7781da4170f907b8a020eb3e1d0':
  Fix NPE when showing Toast from system process.
2012-12-06 23:22:05 -08:00
Chris Craik
95a38b92a0 am a9877672: am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev
* commit 'a98776723f12ca1cbe6a8d181a49f179dfd23abd':
  Defer process mode upon draw
2012-12-06 23:21:58 -08:00
Adam Hampson
002221d34a am fd0b2587: am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up
* commit 'fd0b25875c3fe005329d412a2500da1951ff6a7b':
  EthernetDataTracker: Start DHCP on Link Up
2012-12-06 23:21:54 -08:00
Daniel Sandler
b38ecce234 am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit '40ddc2bf4062caf5ce64cff69b697a874802ad9a':
  Fix longstanding nonsense in javadocs.
2012-12-06 19:00:22 -08:00
Adam Cohen
b93762809b am 224d2225: am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
* commit '224d22250862d44cca08498630fcb0e7da68912b':
  Making sure to clear state related to views that are being recycled (issue 7650538)
2012-12-06 19:00:16 -08:00
Fabrice Di Meglio
7ee2f7785f am 09329186: am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
* commit '09329186eaf66b6c03d0ff5cc8df910800649b7d':
  Fix bug #7649607 Hebrew text is cut off in Settings
2012-12-06 18:59:32 -08:00
Craig Mautner
29d4484dd8 am e771f3a6: am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev
* commit 'e771f3a67cbca9976de6b5df6088f6c007df2914':
  Fix NPE when showing Toast from system process.
2012-12-06 18:58:24 -08:00
Chris Craik
a98776723f am 780a53df: am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev
* commit '780a53dfb5176165286ff4f1483b408e28ad6eb7':
  Defer process mode upon draw
2012-12-06 18:58:20 -08:00
Adam Hampson
fd0b25875c am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up
* commit '6a9d57617a9b502c65d62f053ad8bd0309afdc24':
  EthernetDataTracker: Start DHCP on Link Up
2012-12-06 18:58:10 -08:00
Glenn Kasten
ee88bc8ab9 Merge "Document that ByteBuffer position not updated" 2012-12-06 12:00:44 -08:00
Jianzheng Zhou
dcf03f3972 Refactor getPersistedNetworkPreference
Optimize for updating mNetworkPreference according to device's networkAttributes
setting from overlay config.xml when connectivityservice start.

Change-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2012-12-06 12:00:04 -08:00
Daniel Sandler
40ddc2bf40 am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit 'bc305e554427d22420746c66ab67a236c424fec0':
  Fix longstanding nonsense in javadocs.
2012-12-06 11:34:40 -08:00
Daniel Sandler
bc305e5544 Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 2012-12-06 11:31:50 -08:00
Eric Laurent
942de41bb1 Merge "more fixes on safe volume warning message" 2012-12-06 11:26:40 -08:00
Adam Cohen
224d222508 am 29cfce7a: Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev
* commit '29cfce7a387c5f1ea92a310398ed4ed213a3cf62':
  Making sure to clear state related to views that are being recycled (issue 7650538)
2012-12-06 11:05:31 -08:00
Adam Cohen
29cfce7a38 Merge "Making sure to clear state related to views that are being recycled (issue 7650538)" into jb-mr1.1-dev 2012-12-06 11:02:58 -08:00
Adam Cohen
ff06719077 Making sure to clear state related to views that are being recycled (issue 7650538)
Change-Id: I5161ac261f963789537d2066a472cd3036c218aa
2012-12-06 11:01:09 -08:00
Satoshi Kataoka
5bb4ee6d38 Fix an issue on changing the keyboard locale between spellchecking supported language to non-supported language
Bug: 7658675
Change-Id: Ia2353f299506b5871e0104594e4486b6ab1ffa82
2012-12-06 19:30:50 +09:00
Eric Laurent
fde16d5879 more fixes on safe volume warning message
Fixes the following problems with safe headphone volume warning message:
- Do not display the warning dialog when screen is off.
- Use the same 3 second timeout as for the volume slider to dismiss the dialog.
- Do not dismiss the warning dialog when touching outside of the slider window
but inside the warning window.
- Disable the volume slider when the warning message is displayed.
- When setting volume directly (touching the volume slider), and the warning
is displayed, save the requested volume and apply it if acknowledged by the user.
- Do not display the warning message when restoring safe volume after 20h of
cumulative listenening

Bug 7658641.

Change-Id: Ib3d1315193a433dad918aa5df78fa071062b2394
2012-12-05 17:59:39 -08:00
Fabrice Di Meglio
09329186ea am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev
* commit 'b3b2922b10650551664659eadcf9c43cf9628974':
  Fix bug #7649607 Hebrew text is cut off in Settings
2012-12-05 17:20:51 -08:00
Fabrice Di Meglio
b3b2922b10 Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev 2012-12-05 17:17:35 -08:00
Amith Yamasani
c1493e1a01 am 368ee53f: am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev
* commit '368ee53f25cdff7ea89293d2cc81e95816919369':
  Make 3rd party lockscreen widgets work on secondary users
2012-12-05 13:00:41 -08:00
Jeff Brown
384e6fe84d am 1edc6111: am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
* commit '1edc61119d145b05f0b5e1323a2fc0fa6a29d4bc':
  Pin electron beam surface to natural orientation.
2012-12-05 12:28:25 -08:00
Craig Mautner
e771f3a67c am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev
* commit 'ddd75cb1ac225f8ffe8c78a5be8ceb589e0cda27':
  Fix NPE when showing Toast from system process.
2012-12-05 12:27:58 -08:00
Chris Craik
780a53dfb5 am 07efb030: Merge "Defer process mode upon draw" into jb-mr1.1-dev
* commit '07efb0303ff031512b7c38c6e7e9c2fcdb5849c0':
  Defer process mode upon draw
2012-12-05 12:25:13 -08:00
Craig Mautner
ddd75cb1ac Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev 2012-12-05 12:24:25 -08:00