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

15107 Commits

Author SHA1 Message Date
Jaikumar Ganesh
7d0f553852 Merge "Fix A2DP connection problem, if disconnected while playing music." 2010-10-26 11:31:44 -07:00
Patrick Scott
bb8300e155 Merge "Fix debug statements and aapt assert." 2010-10-26 11:26:19 -07:00
Jaikumar Ganesh
b2ec4fa8d7 Fix A2DP connection problem, if disconnected while playing music. 
Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69
 2010-10-26 11:22:48 -07:00
Dianne Hackborn
78098341f8 Merge "Fix issue #3130426: Finsky crash in switching from window carousel" 2010-10-26 11:20:06 -07:00
Gilles Debunne
5b78d8a886 Merge "New Holo style for Tabs." 2010-10-26 11:18:51 -07:00
Dianne Hackborn
fb3cffeb35 Fix issue #3130426: Finsky crash in switching from window carousel 
Need to note that we no longer have saved state before delivering
results or new intents to an activity.

Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data.  This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).

Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747
 2010-10-26 11:09:54 -07:00
Gilles Debunne
44c1473c03 New Holo style for Tabs. 
Holo theme with new assets and style for TabWidgets.

Legacy Themes still use GB style.

Assets added in a previous bluk update were removed.

Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1
 2010-10-26 11:08:05 -07:00
Irfan Sheriff
f235c5ab91 add wps pin from device capability 
Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
 2010-10-26 10:48:11 -07:00
Patrick Scott
4f145c9674 Fix debug statements and aapt assert. 
ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
 2010-10-26 13:22:17 -04:00
Shimeng (Simon) Wang
48c9daac20 Merge "Fix the viewport height to view height when title bar is visible." 2010-10-26 10:05:20 -07:00
Ben Murdoch
b9aa1d9d60 Merge "Update WebView useragent string for merge to WebKit r70209" 2010-10-26 07:44:34 -07:00
Jeff Hamilton
858825c54d am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Ben Murdoch
566440cf3d Update WebView useragent string for merge to WebKit r70209 
Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
 2010-10-26 15:23:30 +01:00
Chet Haase
dcaff67a80 Merge "DisplayList optimizations and fixes." 2010-10-26 06:59:19 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Chet Haase
d98aa2de9a DisplayList optimizations and fixes. 
We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
 2010-10-26 06:54:55 -07:00
Jaikumar Ganesh
de9878d44f Merge "Add logs to debug incoming A2DP connection issue." 2010-10-26 00:32:06 -07:00
Jaikumar Ganesh
8febf88618 Add logs to debug incoming A2DP connection issue. 
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
 2010-10-26 00:28:39 -07:00
Jaikumar Ganesh
e8b7f399f1 Merge "Clean up some logging to make it more useful to debug." 2010-10-26 00:18:31 -07:00
Jaikumar Ganesh
b1ef244732 Clean up some logging to make it more useful to debug. 
Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
 2010-10-26 00:15:45 -07:00
Jaikumar Ganesh
bac9c29437 Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent." 2010-10-25 19:41:57 -07:00
Jaikumar Ganesh
a46f2fb152 Implement ACTION_CONNECTION_STATE_CHANGED intent. 
Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
 2010-10-25 18:44:57 -07:00
Adam Powell
c841ef04eb Merge "Holo: vertical dividers, group button states, default window backgrounds." 2010-10-25 17:44:35 -07:00
Adam Powell
5d2b178f5c Holo: vertical dividers, group button states, default window backgrounds. 
Change-Id: I06b1397a8026d01a2e4eca7e87ca2d1edbe4f92e
 2010-10-25 17:32:53 -07:00
Jaikumar Ganesh
5514029304 Fix docs builds. 
Change-Id: I764bd0f0f6994cc468b7ebbea4a3dc7a44b9f89d
 2010-10-25 17:07:51 -07:00
Jaikumar Ganesh
657dbfaedb Merge "Expose Vendor Specific Headset Event Intent." 2010-10-25 16:43:41 -07:00
Jaikumar Ganesh
9bb1278696 Merge "Make setting the adapter properties asynchronous." 2010-10-25 16:38:48 -07:00
Jaikumar Ganesh
ff7db40be1 Make setting the adapter properties asynchronous. 
1. These involve disk operations and multiple processes.
2. onPropertyChange already informs us asychronously.
3. Settings app is the only user, will have to revisit the function
   if we make them public.

Change-Id: If019a83c05a0c9e625f27faf99063d33f369f0d8
 2010-10-25 16:36:45 -07:00
Eric Fischer
b2ddeee2d2 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
 2010-10-25 16:19:42 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE 
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
 2010-10-25 15:41:31 -07:00
Romain Guy
551397d5eb Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952" 2010-10-25 15:36:18 -07:00
Romain Guy
c361da845a Don't initialize the hw renderer without a valid surface. 
Bug #3054952

Change-Id: I5b4074391dbd84b04a14f7d2fb1b9a4a2487e1e2
 2010-10-25 15:29:10 -07:00
Jeff Hamilton
6dc0c73fb0 am fecc5f06: am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e'

* commit 'fecc5f066d7aa84ce3474912f1137a10bd77bb8e':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:56:34 -07:00
Jeff Hamilton
fecc5f066d am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread 
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp

* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
  Add a RHS status bar slot for NFC.
 2010-10-25 14:49:07 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC. 
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
 2010-10-25 16:41:41 -05:00
Adam Cohen
c18b2e504a Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1" 2010-10-25 14:11:00 -07:00
Adam Cohen
a9238c89a4 -> Fixing a bug where AdapterViewAnimator doesn't refresh correctly 
-> Reduced swipe threshold for StackView
Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1
 2010-10-25 14:03:11 -07:00
Shimeng (Simon) Wang
346f97f82f Fix the viewport height to view height when title bar is visible. 
issue: 3097787
Change-Id: Ie685a94262cecd94f32dbb94991fea76ceb43b94
 2010-10-25 13:33:31 -07:00
Vasu Nori
6db925001e Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
ba42fb3a25 Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -07:00
Adam Powell
67bb674196 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
 2010-10-25 12:07:51 -07:00
Vasu Nori
b73cf1cc39 increase sql statement printed in finalier warnings from 100 to 1000 
100 for sql statement seems too small for some apps (gmail is one example)

Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
 2010-10-25 11:55:56 -07:00
Vasu Nori
74fb2685e2 when printing cache-full warning, print the sql statements in cache 
this should help debug developers in idetifying the sql statements
taking up cache slots

Change-Id: Ibc0140c273adc5c8d58ab359d2c4d4ce14b6b63b
 2010-10-25 11:50:56 -07:00
Adam Powell
17efcde161 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
dc28be1095 resolved conflicts for merge of 177b05d6 to master 
Change-Id: I21072a31a28d0e0ea242d1d4f81e5f5f657e6364
 2010-10-25 11:37:08 -07:00
Scott Main
177b05d614 am abb50f15: Merge "docs: fix a couple api links" into gingerbread 
Merge commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd' into gingerbread-plus-aosp

* commit 'abb50f152879cc8dff1bf5cbc4d6375e959305cd':
  docs: fix a couple api links
 2010-10-25 11:27:55 -07:00
Scott Main
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Adam Powell
b9b8f7b99b DO NOT MERGE Fix bug 3124899 - timeout in CTS test 
ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
 2010-10-25 11:12:41 -07:00