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

93928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Huber
30676a7031 am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 
* commit 'bb2985aa0e3435a4a945233eebc9ea36769209d2':
  Make it clear that non-optional MediaFormat keys are required
 2012-12-06 18:59:53 -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
Jim Miller
5b09fcc716 am 946f6ab4: am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 
* commit '946f6ab44048138c03f9bcf93451322b4397f8f9':
  Fix password field focus in keyguard
 2012-12-06 18:59:24 -08:00
Winson Chung
f882bc3367 am a1bc0979: am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
* commit 'a1bc0979a8cd7389ef4f7f4800fc58cd987ffee2':
  Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
 2012-12-06 18:59:19 -08:00
Fabrice Di Meglio
1527cc19ed am a4884a12: am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit 'a4884a12a1a6d833bad2e0d0fb85f2129e0a936f':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-06 18:59:10 -08:00
Jeff Sharkey
a4ff88cf57 am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit '1fad16a6353f912168b130a9e595ac4540487827':
  Fix baseline alignment of notification times.
 2012-12-06 18:59:06 -08:00
Victoria Lease
ad5814b5b1 am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev 
* commit 'bc36b52372be154994f19a9e767184b2d6b4783a':
  DO NOT MERGE Adjust update interval when expiring location requests.
 2012-12-06 18:59:01 -08:00
Scott Main
1a10de0f6b am 23d8835d: am ab3a5d94: am 40f7a513: docs: remove minsdkversion for clarity 
* commit '23d8835dc112ef0c65fac41cf1a1a00cb6bc776d':
  docs: remove minsdkversion for clarity
 2012-12-06 18:58:31 -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
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
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
Irfan Sheriff
628ba035b3 am 1612e298: Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 
* commit '1612e29826dfe55f8deca27374046c5931ce5335':
  AsyncChannel to support remote death notification and post a disconnect message to the source handler.
 2012-12-06 10:59:10 -08:00
Irfan Sheriff
46e3807952 am c602187e: Merge "Prevent scanning during DHCP process" 
* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
  Prevent scanning during DHCP process
 2012-12-06 10:39:04 -08:00
Andreas Huber
bb2985aa0e am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev 
* commit '683028ca0dab7b5cf7afff4501c2372350231bae':
  Make it clear that non-optional MediaFormat keys are required
 2012-12-06 08:06:17 -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
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -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
Jim Miller
946f6ab440 am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev 
* commit '9819a61745b8eea3b3b7fa3af2c1ba017192cc36':
  Fix password field focus in keyguard
 2012-12-05 16:42:13 -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
a1bc0979a8 am 0db59a85: Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" 
* commit '0db59a856f9b4a6ae53854a88fea3a3675d572fd':
  Revert "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)"
 2012-12-05 16:35:01 -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
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
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
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
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
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 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
Irfan Sheriff
c602187e51 Merge "Prevent scanning during DHCP process" 2012-12-05 09:25:43 -08:00