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

47345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
9fa5470449 Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 2011-06-14 14:55:35 -07:00
Mathias Agopian
69b4587bfb DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
 2011-06-14 12:05:42 -07:00
Robert Ly
f25be17f64 cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7 
Conflicts:

	docs/html/guide/topics/usb/adk.jd

Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
 2011-06-14 11:50:19 -07:00
Dianne Hackborn
700a1f2571 Merge "Update resources documentation with new qualifiers." into honeycomb-mr2 2011-06-14 11:27:09 -07:00
Dianne Hackborn
c5193c6285 Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 2011-06-14 11:24:29 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features. 
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
 2011-06-14 11:23:52 -07:00
Dianne Hackborn
ce67da79e7 Update resources documentation with new qualifiers. 
Change-Id: I4a3e0d3ece64d8a177157e469c39dbb282094373
 2011-06-13 22:01:13 -07:00
Mathias Agopian
a9c9a4baf2 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Dianne Hackborn
fd63814abe Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2 2011-06-10 18:37:22 -07:00
Dianne Hackborn
afc4b283fd Fix some problems with moving in and out of detached state. 
Loaders were not being re-initialized correctly when coming back
(this would also impact the back stack).  The ListView also wasn't
working correctly, and there were also problems with simply
re-using a Fragment instance after it had been removed.

Change-Id: I534b091ae09c0ef7ffffe9d68049e6840e8926b3
 2011-06-10 18:34:54 -07:00
Jim Miller
8daefb9c63 Fix layout issue on table when device thinks there's a SIM. 
bug:4411799
Change-Id: I9d9ef036d4cf424ed760e0db157bb1f020b7c678
 2011-06-10 15:57:09 -07:00
Teng-Hui Zhu
90bdb69bf9 Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2 2011-06-10 14:19:22 -07:00
Teng-Hui Zhu
2302fe5226 fix one NPE when webChromeClient don't have progress view support 
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
 2011-06-10 10:56:33 -07:00
Dianne Hackborn
2bb2d48f9c Commit final (maybe) MR 2 API. 
Change-Id: I42f72819a29d4ac7902b7be5af0b5d353d790eae
 2011-06-09 19:22:05 -07:00
Dianne Hackborn
d86302df0e Quiet the log. 
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
 2011-06-09 17:37:00 -07:00
Dianne Hackborn
f795e9a86d Okay *now* really enforce the limit on non-public styles. 
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
 2011-06-09 16:17:53 -07:00
Dianne Hackborn
8821ba8606 Ummm... f*, stop breaking the build. 
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
 2011-06-09 16:09:15 -07:00
Dianne Hackborn
220cd77de6 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Mike Lockwood
b3174c46ad UsbService: Fix JNI reference leak 
http://code.google.com/p/android/issues/detail?id=17365

Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-09 14:48:11 -04:00
Justin Ho
1d3173c3dc Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Xavier Ducrohet
8ee28811ad Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:12:40 -07:00
Justin Ho
3116496837 Updating default wallpaper of large devices to match xlarge 
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
 2011-06-09 09:42:22 -07:00
Dianne Hackborn
5ba2e872fa Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode. 
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
 2011-06-08 22:26:33 -07:00
Dianne Hackborn
e22fe9331a Fix issue #4582417: Need to add new PackageManager... 
...FEATURE_ constant for FAKE_MULTITOUCH in MR2

Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
 2011-06-08 20:38:41 -07:00
Dianne Hackborn
021408910a Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 2011-06-08 20:00:50 -07:00
Mathias Agopian
645434fb4e Merge "Fix a leak in RefBase" into honeycomb-mr2 2011-06-08 19:28:39 -07:00
Dianne Hackborn
5fd2169eab Work on issue #4518815: Compatibility mode introduces compatibility regression... 
...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components.  This addresses everything
I could find.

Unfortunately it does *not* fix this particular app.  I am starting to think this
is just an issue in the app.  This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
 2011-06-08 18:45:43 -07:00
Xavier Ducrohet
45b662e1bc Merge 06942bc4 from hc-mr1. 
Layoutlib - use the new getParser callback when possible.

Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
 2011-06-08 17:11:40 -07:00
Xavier Ducrohet
beb5fb622b Merge 988eeeb5 from hc-mr1. 
Support for custom declare-styleable attr with enum/flag in layoutlib.

Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
 2011-06-08 17:10:11 -07:00
Adam Powell
4381f6421c Merge "Public styles for action bar tabs" into honeycomb-mr2 2011-06-08 16:54:50 -07:00
Mathias Agopian
2c0042b666 Fix a leak in RefBase 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Id85e749ba04521199555dd701198edd097c313d4
 2011-06-08 16:25:01 -07:00
Adam Powell
1a4678b93f Public styles for action bar tabs 
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
 2011-06-08 15:13:50 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Jeff Brown
25bd8abce9 Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a Fix swipe gesture cosine calculation. 
Bug: 4124987

Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.

Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
 2011-06-07 16:50:14 -07:00
Adam Powell
68b8143496 Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 2011-06-07 16:19:26 -07:00
Adam Powell
982cb98393 Fix bug 4533120 - rough handling of invalid event streams in 
ScaleGestureDetector

Make ScaleGestureDetector a bit more tolerant of bogus event streams.

Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
 2011-06-07 16:13:51 -07:00
Dianne Hackborn
a3ce0f1e6f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
2947826931 Remove compat mode dialog. 
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
 2011-06-07 15:44:22 -07:00
Dianne Hackborn
dfe824ef3e Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 2011-06-07 15:36:51 -07:00
Mathias Agopian
f6c8206735 fix a surface leak introduced by a failed merge (DO NOT MERGE) 
Bug: 4558502
Change-Id: Ibf889d03caa806c34603ad45f135b78c3851f55c
 2011-06-07 14:52:22 -07:00
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Robert Greenwalt
8de47a2f25 Merge "Reveal some network constants." into honeycomb-mr2 2011-06-07 12:00:37 -07:00
Adam Powell
a476813dcc Make Theme.Holo.Light.NoActionBar and 
Theme.Holo.Light.NoActionBar.Fullscreen public.

Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
 2011-06-07 10:11:59 -07:00
Jeff Brown
5cb05eea28 Merge "Fix build." into honeycomb-mr2 2011-06-06 21:06:30 -07:00
Jeff Brown
9181a5f40c Fix build. 
Change-Id: I9ea07637058e2aa74d20d881bc21fea305cc869e
 2011-06-06 21:04:14 -07:00
Jeff Brown
2c1804998b Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:32:18 -07:00