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

94049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
6350cfb529 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 '6a3ad968318f7b655b871972770a2bd344adaec5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:48:03 -08:00
Dirk Dougherty
6a3ad96831 am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '1cb5ad47a1137ffab0d935f186c5ea6645dd59e5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:45:39 -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
74dd15b202 am 0de625b5: am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '0de625b5c687519f1f389fd522556af775ac762e':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:34:07 -08:00
Scott Main
0de625b5c6 am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '174af19814451ddb7e4ec76cfbea06ed86233ddf':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:32:39 -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
87830ae771 am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'aa3ac463c99e50e574fb02c4ea5015beedb8debe':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:49:18 -08:00
Laurent Tu
aa3ac463c9 am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'dd549bcc29402198698865cf4fd9650d0e909d23':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:47:19 -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
b0ebd4e941 am 2fb9b61a: am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit '2fb9b61a766a1faa0dca166c19f27cac58763f8d':
  docs: fix broken link on maps page
 2012-12-04 17:39:46 -08:00
Scott Main
2fb9b61a76 am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit '315557b0154bc5fcfe79131a8092985d8fada6e2':
  docs: fix broken link on maps page
 2012-12-04 17:37:28 -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
Scott Main
8b93e77c9d am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '1e94db6ef9a43a6468bf7f4e64e3536cb87fbf5c':
  docs: update webview guide with javascript interface info
 2012-12-04 17:33:30 -08:00
Scott Main
78d17441fa docs: fix broken link on maps page 
Change-Id: I07e8129df1dcc61b0c2f7b81065092b06e31b8e8
 2012-12-04 17:32:30 -08:00
Scott Main
1e94db6ef9 am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '3341bde3d75ffe29a540af6b77051bb1afde08a2':
  docs: update webview guide with javascript interface info
 2012-12-04 17:31:22 -08:00
Scott Main
3341bde3d7 am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit 'fc677afec5ecae1844c0f46e381b9b7967d820b4':
  docs: update webview guide with javascript interface info
 2012-12-04 17:29:18 -08:00
Scott Main
cbb234e4b8 am 13bad174: am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit '13bad174f50abc6f782e5570809883e59bc15163':
  docs: fix AI download links
 2012-12-04 17:27:46 -08:00
Scott Main
fc677afec5 Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 2012-12-04 17:25:58 -08:00
Scott Main
13bad174f5 am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit '8a1074d5500b16509687fa383e07f46cce996ce8':
  docs: fix AI download links
 2012-12-04 17:25:38 -08:00
Scott Main
8a1074d550 am 7550a393: docs: fix AI download links 
* commit '7550a393e0bb7b5f75fd558c828653097723d201':
  docs: fix AI download links
 2012-12-04 17:23:39 -08:00
Jeff Sharkey
29afa14240 Remove unnecessary locking for screen broadcasts. 
The actual handling occurs in updateScreenOn() on the other side of a
handler, which acquires the lock correctly.

Change-Id: Ibd359446dba8e88f81d34f1e10a6b5e150348f89
 2012-12-04 17:21:38 -08:00
Jeff Brown
1edc61119d am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 
* commit '61e21940ffd643dad1aa6c7c3dc9933815aecd74':
  Pin electron beam surface to natural orientation.
 2012-12-04 17:21:00 -08:00