The Android Automerger
20340705bb
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 19:33:40 -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
Wink Saville
875eef2daa
am 8c0e3c23: am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option"
...
* commit '8c0e3c232a9000b347b18340fa343a15d4434d7b':
Add config_speed_up_audio_on_mt_calls option
2012-12-10 18:13:29 -08:00
Wink Saville
8c0e3c232a
am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option"
...
* commit '7419905676db3cecb011d7e63a0eb64421e02b55':
Add config_speed_up_audio_on_mt_calls option
2012-12-10 18:11:34 -08:00
Stephen Hines
cca2455dc1
Test bounds on rsForEach calls.
...
Change-Id: I1dedfda90200bac984b552d52e1ac26523085357
2012-12-10 17:45:33 -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
b2a12263db
Merge "Preserve Spinner widget open state across instance save/restore"
2012-12-10 15:31:18 -08:00
The Android Open Source Project
5178a53886
am a41474d4: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit 'a41474d45c455c98bae9986b626374cb626886ce':
2012-12-10 15:23:18 -08:00
Wink Saville
e2d2877aa4
am 879723dd: am e22217c2: Merge "Telephony: Use IccUtils from uicc package"
...
* commit '879723dd2d89238bdd6c9e126e4c7a4418469c84':
Telephony: Use IccUtils from uicc package
2012-12-10 15:19:41 -08:00
The Android Open Source Project
a41474d45c
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4
2012-12-10 15:19:31 -08:00
John Spurlock
bbdb062d98
Fallback to default dream if the current dream is removed.
...
To minimize fix size, return only valid dreams from the service api.
Settings will "just work" with no changes.
Bug:7699398
Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8
2012-12-10 18:15:07 -05:00
Wink Saville
879723dd2d
am e22217c2: Merge "Telephony: Use IccUtils from uicc package"
...
* commit 'e22217c2787b0f4967b357d080d49a7f095b2db9':
Telephony: Use IccUtils from uicc package
2012-12-10 14:48:21 -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
Wink Saville
e22217c278
Merge "Telephony: Use IccUtils from uicc package"
2012-12-10 14:13:18 -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
The Android Automerger
7406c32d42
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 13:06:04 -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
Quddus Chong
e0d6015bdc
am 81f91ce9: am ecacbd26: am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs.
...
* commit '81f91ce997ed71421ec9dfa0d628e848bfde6579':
docs: Edit fixes for IABv3 docs.
2012-12-10 11:39:30 -08:00
Quddus Chong
81f91ce997
am ecacbd26: am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs.
...
* commit 'ecacbd266a7bfe52610066ec44439977cc067a98':
docs: Edit fixes for IABv3 docs.
2012-12-10 11:36:56 -08:00
Quddus Chong
ecacbd266a
am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs.
...
* commit '8642f406dcfa23836903540c7ecb0895e1e7ac4d':
docs: Edit fixes for IABv3 docs.
2012-12-10 11:34:56 -08:00
Adam Powell
ba534dece2
Merge "Update documentation to mention compatibility versioning"
2012-12-10 11:34:19 -08:00
Quddus Chong
8642f406dc
am 9d7578c7: docs: Edit fixes for IABv3 docs.
...
* commit '9d7578c73afa69272dcf9476ae3eefc2b59d6778':
docs: Edit fixes for IABv3 docs.
2012-12-10 11:32:58 -08:00
Quddus Chong
9d7578c73a
docs: Edit fixes for IABv3 docs.
...
Change-Id: I20228491c90d05a39ce44f80aa1a065ce60c31e3
2012-12-10 11:17:48 -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
Alex Yakavenka
5d35fcfc32
Telephony: Use IccUtils from uicc package
...
Change-Id: I80204a2f3dc57cac875abeab390bb9db7a636ff7
2012-12-10 10:35:08 -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
c092b8d3cf
Import translations. DO NOT MERGE
...
Change-Id: Ie6f2c7d8008afc642ca538f48d673333f723c086
Auto-generated-cl: translation import
2012-12-10 09:33:35 -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
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
Quddus Chong
6f0c7b5068
am 5fe65556: am 3aecb61b: am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs.
...
* commit '5fe65556c532c3d51ede4ad794dc886b382ea42c':
docs: Merged commits for final release of IABv3 docs.
2012-12-09 18:55:46 -08:00
Quddus Chong
5fe65556c5
am 3aecb61b: am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs.
...
* commit '3aecb61bebbe038b74b5e0d96acbb7142835127e':
docs: Merged commits for final release of IABv3 docs.
2012-12-09 18:53:52 -08:00
Quddus Chong
3aecb61beb
am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs.
...
* commit '47050d3578986febcc4b28f901effd6b4b9ae41a':
docs: Merged commits for final release of IABv3 docs.
2012-12-09 18:51:35 -08:00