Adam Powell
90f4c5c9d4
am c6f05e93: am d22843a8: Merge "Fix regression in ListView click handling"
...
* commit 'c6f05e93dc37db67addcd19ff87ba013ba817035':
Fix regression in ListView click handling
2012-12-11 18:04:23 -08:00
Adam Powell
c6f05e93dc
am d22843a8: Merge "Fix regression in ListView click handling"
...
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
Fix regression in ListView click handling
2012-12-11 18:02:30 -08:00
Christopher Tate
1423fa30c2
am 1de62393: am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
...
* commit '1de623939090993d03a7c398d09e2d13950d682b':
Make immersive mode public & imply update locking
2012-12-11 16:15:38 -08:00
Christopher Tate
1de6239390
am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
...
* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
Make immersive mode public & imply update locking
2012-12-11 16:13:51 -08:00
Christopher Tate
534de491e6
Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev
2012-12-11 16:11:00 -08:00
Adam Powell
847be7445e
Fix regression in ListView click handling
...
Regression caused by patch a607223f34
If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.
Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
2012-12-11 15:56:10 -08:00
Jeff Brown
ace7404de8
resolved conflicts for merge of d7337fb9 to master
...
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
2012-12-11 15:21:02 -08:00
Jeff Brown
d7337fb97a
am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
...
* commit '3781523becbb2d576761c2701763ff3588294a97':
Play a tone when wireless charging begins.
2012-12-11 14:19:41 -08:00
Jeff Brown
3781523bec
am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
...
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
Play a tone when wireless charging begins.
2012-12-11 14:17:50 -08:00
Jeff Brown
eaae7d976a
Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
2012-12-11 14:14:54 -08:00
Chet Haase
8ee38721e0
Merge "Fix requestLayout-during-layout issue with Gallery"
2012-12-11 14:09:29 -08:00
Chet Haase
bfea76c787
Fix requestLayout-during-layout issue with Gallery
...
The way that the Gallery was adding views (which it does in layout)
triggered a requestLayout() because of a call to setLayoutParams()
in View.addViewInner(). This tripped up the new logic that makes
layout-in-layout work, causing layout to be called on every frame,
even when the app was not doing anything.
The fix is to call the appropriate version
of requestLayoutInner() to tell it to skip calls to requestLayout().
Issue #7714495 requestLayout in endless loop
Change-Id: Icdcd886d30e4dd972da36bc6e50732c7213530c5
2012-12-11 14:05:24 -08:00
Jeff Brown
84e2756c0f
Play a tone when wireless charging begins.
...
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.
Use new low battery and wireless charging sounds on Mako.
Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
2012-12-11 12:55:03 -08:00
Amith Yamasani
03cb98aecf
Move Observer test to servicetests
...
Change-Id: Ib3493af4eb3185db79004a3cad5473161ed51f71
2012-12-11 11:15:25 -08:00
Amith Yamasani
e03c17f1cb
Merge "Move one more test."
2012-12-11 11:08:06 -08:00
Amith Yamasani
814a8d35ae
Move one more test.
...
Change-Id: Iea0e0b5727746f2332db2ab1c1b216326eb50f13
2012-12-11 11:06:21 -08:00
Amith Yamasani
8ff9a156c0
Fix build. Forgot to move this test.
...
Change-Id: I06aab8ec6e2dac86b65bbeed3587444260fec2e8
2012-12-11 10:42:09 -08:00
Jeff Sharkey
7a96c39c51
Move lingering services to services.jar.
...
This helps reduce the pressure on framework.jar, and makes it clear
that it should only be used by the system_server.
Bug: 7333397
Change-Id: I0858904239535380fbf30562b793e277d8c3f054
2012-12-11 09:50:50 -08:00
Baligh Uddin
32de9220e0
Merge "Import translations. DO NOT MERGE"
2012-12-10 20:32:41 -08:00
Baligh Uddin
8672f044ff
am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
Import translations. DO NOT MERGE
2012-12-10 20:20:17 -08:00
Baligh Uddin
d39a0d8041
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-12-10 20:19:06 -08:00
Baligh Uddin
73f6e3f583
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-12-10 20:17:14 -08:00
Mita Yun
b84b9c2191
am 81f82d29: am aa8dc2ee: Removed mCallbackLooper from WallpaperService
...
* commit '81f82d29ed3c93704c4fa0cbfeb48a675b71c349':
Removed mCallbackLooper from WallpaperService
2012-12-10 19:50:11 -08:00
Christopher Tate
73c2aee40a
Make immersive mode public & imply update locking
...
Activity.setImmersive(boolean) / android:immersive="bool" are now public.
In addition, if the foreground activity is immersive then an update lock
will be held on its behalf. This lets applications such as movie players
suppress the display of intrusive notifications, OTA-availability dialogs,
and the like while they are displaying content that ought not to be
rudely interrupted.
The update lock aspect of this mode is *advisory*, not binding -- the
update mechanism is not actually constrained; it simply uses this information
in deciding whether/when to prompt the user. It's more a guideline than
a rule.
Bug 7681380
Change-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5
2012-12-10 18:40:57 -08:00
Mita Yun
81f82d29ed
am aa8dc2ee: Removed mCallbackLooper from WallpaperService
...
* commit 'aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
Removed mCallbackLooper from WallpaperService
2012-12-10 18:36:01 -08:00
Mita Yun
aa8dc2ee18
Removed mCallbackLooper from WallpaperService
...
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
2012-12-10 18:32:03 -08:00
Alex Yakavenka
4fee26799e
am 176c7a2b: am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option
...
* commit '176c7a2b72ff3ee6c34096cb637a48058a7b6798':
Add config_speed_up_audio_on_mt_calls option
2012-12-10 17:36:45 -08:00
Alex Yakavenka
176c7a2b72
am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option
...
* commit '4d56777e678ab17379ec54a0875a14299817da8e':
Add config_speed_up_audio_on_mt_calls option
2012-12-10 17:08:58 -08:00
Alex Yakavenka
4d56777e67
am 32b424f7: Add config_speed_up_audio_on_mt_calls option
...
* commit '32b424f7240580e3948f44559050262e18de99d8':
Add config_speed_up_audio_on_mt_calls option
2012-12-10 17:06:44 -08:00
Wink Saville
7419905676
Merge "Add config_speed_up_audio_on_mt_calls option"
2012-12-10 17:03:46 -08:00
Mita Yun
d44280e288
resolved conflicts for merge of ebcbfb3f to master
...
Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683
2012-12-10 16:50:22 -08:00
Alex Yakavenka
32b424f724
Add config_speed_up_audio_on_mt_calls option
...
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
2012-12-10 15:47:35 -08:00
Adam Powell
f930fee835
Merge "Set an ID for the action bar's Spinner"
2012-12-10 15:44:09 -08:00
Adam Powell
29c04ef841
Set an ID for the action bar's Spinner
...
This ensures state is preserved properly.
Change-Id: I4bdccaf9b8a30a0a38466a5615cebbb596d80fb4
2012-12-10 15:42:22 -08:00
Adam Powell
6a7304c95b
Merge "Clear SearchView query field when collapsed as an action view"
2012-12-10 15:38:33 -08:00
Mita Yun
ebcbfb3fc7
am a98cd512: Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev
...
* commit 'a98cd5122be643a51f563d02069e8f9409d44394':
Use asynchronous messages for input method events.
2012-12-10 15:35:05 -08:00
Adam Powell
235ae5f6fa
Preserve Spinner widget open state across instance save/restore
...
Also fix a bug where anchored Spinner popups would not properly move
during a layout update.
Bug 7555978
Change-Id: If8dc22b0b40b14789a4e3bdecdeb376984923899
2012-12-10 14:37:59 -08:00
Mita Yun
a98cd5122b
Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev
2012-12-10 14:37:38 -08:00
Adam Powell
99d0ce9a75
Clear SearchView query field when collapsed as an action view
...
Bug 7679852
Change-Id: Ice1b6902670f133219569e1b1d409a152ebc7b16
2012-12-10 13:11:47 -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
d692c2c685
Merge "Fix EventLog string class problem in onOptionMenuSelected"
2012-12-10 11:09:32 -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
Nick Kralevich
efafb77500
am c0ffba90: am 261bc704: Merge "convert jint to uint32_t."
...
* commit 'c0ffba907f6ab539ced94e089ccb4abbf7c2808f':
convert jint to uint32_t.
2012-12-10 10:34:20 -08:00
Nick Kralevich
c0ffba907f
am 261bc704: Merge "convert jint to uint32_t."
...
* commit '261bc70411ba1dd58654c4eb1c91acbbcfb49060':
convert jint to uint32_t.
2012-12-10 10:31:56 -08:00
Nick Kralevich
261bc70411
Merge "convert jint to uint32_t."
2012-12-10 09:44:24 -08:00
Baligh Uddin
f2caaea7af
Import translations. DO NOT MERGE
...
Change-Id: I8c068e86bbd1f63d7f792406d6e2212e4f01cec5
Auto-generated-cl: translation import
2012-12-10 09:27:28 -08:00
Baligh Uddin
ca4d4f7c90
Import translations. DO NOT MERGE
...
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
2012-12-10 09:18:48 -08:00
Baligh Uddin
9f106549bc
Import translations. DO NOT MERGE
...
Change-Id: Idecee06e6e72dcc9112b92b793af1bb8f8ce3916
Auto-generated-cl: translation import
2012-12-10 09:16:28 -08:00