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

97827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
a4884a12a1 am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit '0f3af41fbc2845c61676d3dac2c73a10b434be33':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-05 15:20:28 -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
1fad16a635 am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit '3757e234d747b2257be1a2a830b9976177a6bcfd':
  Fix baseline alignment of notification times.
 2012-12-05 14:58:15 -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
bc36b52372 am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit '7b0855715bc6cb14e3ca67d815915d2172f0bc12':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-05 14:06:33 -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
Laurent Tu
578081f9da Move location provider lib to frameworks/ex - 1 
Move location provider lib to frameworks/ex so it can be re-used in
GmsCore.

This is the frameworks/base part of the change (1).

Change-Id: Ifc31a6809876e9c9afb6ed841b66cf06de7e8964
 2012-12-05 13:57:01 -08:00
The Android Open Source Project
9950edcdcf am 08500d57: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '08500d5741ae5b21a397957cfb441787f0224d77':
 2012-12-05 13:00:59 -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
Andreas Huber
8435d0e8ff Merge "Make it clear that non-optional MediaFormat keys are required" 2012-12-05 12:48:12 -08:00
Scott Main
23d8835dc1 am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit 'ab3a5d944eb5b39ed00f3422cee691570e05a3ce':
  docs: remove minsdkversion for clarity
 2012-12-05 12:30:36 -08:00
Dirk Dougherty
e875e9e0d8 am 6350cfb5: am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '6350cfb529b30af88a2bff42962ab111a0cf137b':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-05 12:28:58 -08:00
Scott Main
5923b16f3c am 74dd15b2: am 0de625b5: am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '74dd15b202a9e4b211df916fce3387be19a472c9':
  docs: add link to developer survey on main landing pages
 2012-12-05 12:28:54 -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
Laurent Tu
a0a52e3265 am 87830ae7: (-s ours) am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit '87830ae7714ff31b77850d5bca71a19ee1ce4d7f':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-05 12:28:47 -08:00
Scott Main
b34e1ca709 am b0ebd4e9: am 2fb9b61a: am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit 'b0ebd4e941ad9fafac87b4a351398ded2fae85f5':
  docs: fix broken link on maps page
 2012-12-05 12:28:40 -08:00
Scott Main
1311c9f2c6 am 8b93e77c: am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '8b93e77c9dc2f56a234da83c57c75be8c345ff36':
  docs: update webview guide with javascript interface info
 2012-12-05 12:28:33 -08:00
Scott Main
6fc1fc9056 am cbb234e4: am 13bad174: am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit 'cbb234e4b82fc0b05be136ac7f9d1da244c733a4':
  docs: fix AI download links
 2012-12-05 12:28:28 -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
satok
fb21aa84a8 am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 
* commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1':
  Fix an issue on installing 3rd-party IME by a non-primary user
 2012-12-05 12:28:17 -08:00
Scott Main
1c328df482 am c0512832: am 231719fa: am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse 
* commit 'c0512832f49a80697f2eebb889eeaa035a35029c':
  update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
 2012-12-05 12:28:11 -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
Scott Main
40f7a513bd docs: remove minsdkversion for clarity 
Change-Id: I4ae06f447436ef8170a66a075cc08f1667387133
 2012-12-05 12:25:42 -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
Victoria Lease
e9d16bcfb1 am 6861e258: (-s ours) am 1d20e05e: am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev 
* commit '6861e258f00425f299155a501db59817e8c0c2e9':
  DO NOT MERGE Notify provider when disposing last UpdateRecord
 2012-12-05 12:23:50 -08:00
Scott Main
1eb8f79deb am 5931fa81: am a8a19ac5: am 3b08bb9d: am f9861221: docs: delete gps overview page 
* commit '5931fa81bdf776f35367d8652a2c6d27452c0f08':
  docs: delete gps overview page
 2012-12-05 12:23:46 -08:00
Raph Levien
454ff49293 am 8a3def6e: am 0da0d337: am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev 
* commit '8a3def6ef9d6c16e25ba4927f5b23081e8dd0cc8':
  Fix for bug 7467609 Bad rendering of Telugu text
 2012-12-05 12:23:42 -08:00
Sascha Prueter
cc6f467c35 am 98c95809: am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev 
* commit '98c958097b0dd458ffd3e12f9692c0c9522d932e':
  PRIORITY_MIN notifications should be truly ambient.
 2012-12-05 12:23:38 -08:00
Guang Zhu
07e186ea54 am 32ec47c1: am 63cc22a5: am 4eab3d88: Merge "more app launch test tweaks" into jb-mr1.1-dev 
* commit '32ec47c1b15b5a9c8f8d9e9f324bb6fe353119fe':
  more app launch test tweaks
 2012-12-05 12:23:34 -08:00
Scott Main
851f364648 am f54d82c8: am 639116f1: am 22ab700f: am beb08896: docs: add backup service to gp docs 
* commit 'f54d82c810c14ef4d105c2b015d1277969f33fcd':
  docs: add backup service to gp docs
 2012-12-05 12:23:31 -08:00
Winson Chung
a5c40b774c am 46a1a4b2: am 8f90249d: am ca83e1d5: Merge "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" into jb-mr1.1-dev 
* commit '46a1a4b2febc504a1ceb5429ac329264b158929c':
  Saving and restoring current page when rotating in lockscreen. (Bug 7568412)
 2012-12-05 12:23:27 -08:00
Raph Levien
5fa2cad162 am 4cd6cef3: am 70463dca: am 49ed5da3: Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev 
* commit '4cd6cef3af43d688d75b33c646fc158e837debd0':
  Reorder tone mark and nikhahit in DroidSansThai.ttf
 2012-12-05 12:23:23 -08:00
John Spurlock
de8f01a99b am d201bf77: am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev 
* commit 'd201bf77be606fb21ef469e0174d64a919f92887':
  Kill dreams that do not create a timely service connection.
 2012-12-05 12:23:19 -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
Andreas Huber
08067d376e Make it clear that non-optional MediaFormat keys are required 
Also mark KEY_CHANNEL_MASK optional.

Change-Id: I569087f564dc60a89b15a3440a9b1c538927f610
 2012-12-05 11:12:26 -08:00
The Android Open Source Project
08500d5741 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I68071eb0e5fc2164b29cda613bfb490fc80f8e12
 2012-12-05 11:08:55 -08:00
Adam Hampson
6a9d57617a EthernetDataTracker: Start DHCP on Link Up 
The behavior of mLinkUp has previously changed so that it only
represents the link state.  This changes fixes
interfaceLinkStateChanged() so that it triggers a reconnect based
only on the present link state.

Change-Id: I950e04e1f5b5019d59d3b9530f369f8b8f13134a
Signed-off-by: Adam Hampson <ahampson@google.com>
 2012-12-05 10:29:23 -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
Victoria Lease
0a19ad089a Adjust update interval when expiring location requests. 
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: I88b419c92940b7e536d48b26e5fc0f72f3c9e73d
 2012-12-05 09:57:40 -08:00
Irfan Sheriff
c602187e51 Merge "Prevent scanning during DHCP process" 2012-12-05 09:25:43 -08:00
Amith Yamasani
368ee53f25 am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit 'f663cad2248d5d38957f8e1408cd794c0de90202':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:06:02 -08:00
Amith Yamasani
f663cad224 am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit '6c58b155c3bdde355adb03b191e43d8eec089fb2':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:03:32 -08:00
Hai Guo
4a68e3c26d fix typo in docs 
description of 'android/hardware/Camera.Parameters.html#
    setPreviewFpsRange(int, int)' not right

Change-Id: Ic83c0f404710a0125138df1e2b7663994301aee7
 2012-12-05 21:50:28 +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
Jim Miller
e81f55bae8 am eac4be7e: am 4fa27f31: am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev 
* commit 'eac4be7ef28a9dfba9e6cc6d0501b4bd2146041a':
  Fix ring volume issue by addressing focus regression in keyguard.
 2012-12-04 21:53:44 -08:00