drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,916 Commits 1 Branch 0 Tags
Commit Graph

88916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
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
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
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
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
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
Baligh Uddin
ca4d4f7c90 Import translations. DO NOT MERGE 
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
 2012-12-10 09:18:48 -08:00
Quddus Chong
47050d3578 am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '768dba6d8cd6ad56fb6d4e7e30b3260e0d5e0ffd':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:49:39 -08:00
Quddus Chong
768dba6d8c docs: Merged commits for final release of IABv3 docs. 
Change-Id: Ib7c26052bb1b4de9a44d78817d7012839eaa953a
 2012-12-09 18:24:06 -08:00
The Android Automerger
5e6afa5f27 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-07 13:26:16 -08:00
Sascha Prueter
203f69f099 Merge "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE" into jb-mr1.1-dev 2012-12-07 12:36:09 -08:00
Baligh Uddin
ef489fe9ed Import translations. DO NOT MERGE 
Change-Id: I4aaf67f3d31f73092284f9ebc09e7f619591cf5e
Auto-generated-cl: translation import
 2012-12-07 11:50:46 -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
The Android Automerger
c355b831bf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-06 19:36:10 -08:00
Eric Laurent
2b89f73ef8 Enforce camera shutter sound for Korea. 
Bug 7680515.

Change-Id: Iafd0296aac36bd048e409f42f7e99eb0895d3d26
 2012-12-06 15:58:19 -08:00
Jake Hamby
91bb07718b Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev 2012-12-06 15:08:38 -08:00
Jake Hamby
37a2163267 Enable Turkish language encoding for Turkish SIM cards. 
Enable Turkish language encoding for SMS messages. Adds an
MCC-specific config.xml override to enable the Turkish
language tables for Turkish SIM cards. Also modifies
GsmAlphabet.java to load the config.xml values before use,
so the SMSDispatcher will get the current values instead of
caching the boot-time values before the MCC is loaded.

Bug: 7422368
Change-Id: I57cd5fcc1d04a2d0cba3e8b9022078679cf5d4c1
 2012-12-06 14:53:44 -08:00
Daniel Sandler
bc305e5544 Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev 2012-12-06 11:31:50 -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
The Android Automerger
b97dcaa74c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-06 10:39:19 -08:00
Andreas Huber
683028ca0d Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 2012-12-06 08:04:44 -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
Jim Miller
9819a61745 Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 2012-12-05 16:37:52 -08:00
Winson Chung
0db59a856f Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
This reverts commit 6cbc2e81742039969e081a9eed02060fb8789e25.
 2012-12-05 16:04:23 -08:00
Fabrice Di Meglio
0f3af41fbc Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 2012-12-05 15:17:35 -08:00
Jim Miller
42df15e93d Fix password field focus in keyguard 
This fixes a bug introduced in Change-Id: I34b7db402401a824f463d35d7546c05dc2979243 where
the top-most view was allowed to capture focus in order to ensure the device handled volume
key events.

This resolves the issue by restoring previous behavior and ensures we still handle media keys,
regardless of focus.

Fixes bug 7676996

Change-Id: Id2d1200be81640e4b4b7b5e3a0af099d6fc2d259
 2012-12-05 15:15:00 -08:00
Jeff Sharkey
3757e234d7 Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 2012-12-05 14:54:00 -08:00
Andreas Huber
4df82703a7 Make it clear that non-optional MediaFormat keys are required 
Also mark KEY_CHANNEL_MASK optional.

Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
related-to-bug: 7623602
 2012-12-05 14:28:22 -08:00
Victoria Lease
7b0855715b Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 2012-12-05 14:03:28 -08:00
Scott Main
ab3a5d944e am 40f7a513: docs: remove minsdkversion for clarity 
* commit '40f7a513bd12dd334e75f6aa7e2b59acdb29ba0f':
  docs: remove minsdkversion for clarity
 2012-12-05 12:28:48 -08:00
Scott Main
40f7a513bd docs: remove minsdkversion for clarity 
Change-Id: I4ae06f447436ef8170a66a075cc08f1667387133
 2012-12-05 12:25:42 -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
Chris Craik
07efb0303f Merge "Defer process mode upon draw" into jb-mr1.1-dev 2012-12-05 12:22:41 -08:00
Victoria Lease
5959bf2d3c DO NOT MERGE Adjust update interval when expiring location requests. 
Cherry-pick I88b419c92940b7e536d48b26e5fc0f72f3c9e73d

This is a more complete solution for this issue that disables
location providers when expiring their last request *and* adjusts
update intervals when expiring any request. This should help
further limit battery drain when a high-frequency-update app
exits, as it allows the system to throttle the update interval
back down to something appropriate for the remaining listeners.

Bug: 7611837
Change-Id: I7629a90f4c693be4bf96d662bd3a8b06dae0b089
 2012-12-05 12:15:16 -08:00
The Android Automerger
c1988b66a5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:48 -08:00
Craig Mautner
54ae2f389c Fix NPE when showing Toast from system process. 
The system process has no ApplicationContext and consequently was
returning null. Use the base Context in these cases.

Bug 7673699 fixed.

Change-Id: Ie2ab856bb0baefff44775a12bef7802320f72656
 2012-12-05 09:57:44 -08:00
Amith Yamasani
6c58b155c3 Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 2012-12-05 05:45:00 -08:00
Daniel Sandler
8aa9ae69a2 Fix longstanding nonsense in javadocs. 
Change-Id: Iea2c7b8e5dc7591a9586a628e891d71d215daec6
 2012-12-04 23:32:27 -05:00
The Android Automerger
84add94ed2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:58:57 -08:00
Fabrice Di Meglio
9de0ed43c3 Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart" 
- add "viewStart" for popup and list menu items

Change-Id: I3adf1a17080056e6d0e5fc8b9c9c95dcaafa90f6
 2012-12-04 18:52:20 -08:00
Dirk Dougherty
1cb5ad47a1 am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '147b01bc637ad8d184bd0aa2d6bf902e69c92107':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:43:25 -08:00
Dirk Dougherty
147b01bc63 Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 2012-12-04 18:40:32 -08:00
Dirk Dougherty
b973b3adfe Doc change: In-app Billing -- add notes about orderId change and subscription orderIds. 
Change-Id: Iccd08387a6d28ac04c303f9da10d1d98dbf8f8b1
 2012-12-04 18:38:09 -08:00
Scott Main
174af19814 am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '3bb56f02f89d626757b01015be6861f4c6389154':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:31:34 -08:00
Scott Main
3bb56f02f8 docs: add link to developer survey on main landing pages 
Change-Id: Icf635993a6b3ff20d6e226b1e13358fd0ffcd398
 2012-12-04 18:26:52 -08:00
Fabrice Di Meglio
4e46d0fdef Fix bug #7649607 Hebrew text is cut off in Settings 
- in RTL mode and wrap content, make RelativeLayout respect the width that can be  passed to him

Change-Id: I6029135dede1ee80e41ae1bc2a337bf52cf24445
 2012-12-04 18:13:48 -08:00
Laurent Tu
dd549bcc29 Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 2012-12-04 17:45:31 -08:00
Scott Main
315557b015 am 78d17441: docs: fix broken link on maps page 
* commit '78d17441fadc38dc452871da722b1b2900de7a67':
  docs: fix broken link on maps page
 2012-12-04 17:36:00 -08:00