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

30120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
b04ec6a8a7 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
 2011-01-31 17:55:11 -08:00
Dianne Hackborn
7a7ed2b212 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Kenny Root
fa2ae1ad1a Do not check features in PackageManagerService DO NOT MERGE 
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
 2011-01-31 16:27:38 -08:00
Eric Fischer
3efb315313 am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
 2011-01-31 16:18:27 -08:00
Eric Fischer
a019d15b66 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-31 16:08:52 -08:00
Dianne Hackborn
1368454815 am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode 
* commit 'e6c6b760eb0c1068fdfa656007ec27e482313b58':
  DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
 2011-01-31 14:36:02 -08:00
Dianne Hackborn
e6c6b760eb DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode 
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it.  Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.

Change-Id: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
 2011-01-31 13:44:14 -08:00
Eric Fischer
a85afd133f Import revised translations. DO NOT MERGE 
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
 2011-01-31 12:17:36 -08:00
Jean-Baptiste Queru
27badee3f5 am a6fb375c: am 056340ac: Merge "stubs" 
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs
 2011-01-31 12:03:59 -08:00
Jean-Baptiste Queru
a6fb375cf7 am 056340ac: Merge "stubs" 
* commit '056340ac95f233090990d77266d89aad3b60f913':
  stubs
 2011-01-31 11:55:40 -08:00
Jean-Baptiste Queru
056340ac95 Merge "stubs" 2011-01-31 11:32:33 -08:00
Jeff Hamilton
f7176dfbd2 am 113834c5: Commit the final API for level 10. 
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
  Commit the final API for level 10.
 2011-01-31 10:05:13 -08:00
Jeff Hamilton
113834c5ab Commit the final API for level 10. 
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
 2011-01-31 11:46:29 -06:00
Jean-Baptiste Queru
e97cc7d0b2 am 8a2f3ecc: am 25503f1c: Merge from gingerbread 
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
 2011-01-30 16:26:18 -08:00
Jean-Baptiste Queru
1314bdb2b2 am e88fa50b: Merge from open-source gingerbread 
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
 2011-01-30 16:19:59 -08:00
Jean-Baptiste Queru
8a2f3ecc03 am 25503f1c: Merge from gingerbread 
* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015':
  fix failing thread object run
 2011-01-30 16:07:25 -08:00
Jean-Baptiste Queru
25503f1c9f Merge from gingerbread 
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
 2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
e88fa50be8 Merge from open-source gingerbread 
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
 2011-01-30 15:30:03 -08:00
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
a1f5e82f37 am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" 
* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d
 2011-01-29 23:04:50 -08:00
Dianne Hackborn
a30063d80c am 25eb0464: Merge "Normalize output from aapt d" 
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
 2011-01-29 23:01:20 -08:00
Dianne Hackborn
25eb04642c Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
71bb59f9e6 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:30:57 -08:00
Dianne Hackborn
c12cdda949 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Dianne Hackborn
726318b56a DO NOT MERGE: Fix screen size compatibility mode. 
Cherry-picked from HC.

Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
 2011-01-29 18:02:18 -08:00
Dianne Hackborn
e802b59280 am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit '2107757dde0b3159119edcc9084fcb9a87985e88':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:05:30 -08:00
Dianne Hackborn
2107757dde am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 14:59:02 -08:00
Jean-Baptiste Queru
3100207be5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Dianne Hackborn
bbb5a5ce19 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
1358b6a4fb Tweak to make merges easier 
Bug: 3364311

Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
 2011-01-29 12:54:09 -08:00
Jean-Baptiste Queru
34ebb5bfec am 87d19759: Delete browerplugin tests - do not merge 
* commit '87d197597c9130b10ba9d67f17ed81db26e35cd8':
  Delete browerplugin tests - do not merge
 2011-01-29 08:00:52 -08:00
Jean-Baptiste Queru
88d7300d2a am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit 'd4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
  Delete browerplugin tests - do not merge
 2011-01-29 07:58:36 -08:00
Jean-Baptiste Queru
87d197597c Delete browerplugin tests - do not merge 
Those don't build in all environments.

Change-Id: Ie564d464d2745df0114236f2c28aa1254d0f65b5
 2011-01-29 07:41:39 -08:00
Jean-Baptiste Queru
d4c8cec094 am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
  Delete browerplugin tests - do not merge
 2011-01-29 07:39:47 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Robert Greenwalt
6b739dc729 Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Jean-Baptiste Queru
235ec8ad24 stubs 
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
 2011-01-29 06:19:37 -08:00
Jean-Baptiste Queru
9720323a51 Merge "Delete browerplugin tests - do not merge" 2011-01-28 15:26:59 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for. 
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
 2011-01-28 14:48:37 -08:00
Eric Fischer
287fbba5b8 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:19:36 -08:00
Eric Fischer
5f2def8cfd Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Eric Fischer
1c3f1af182 Import revised translations. DO NOT MERGE 
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
 2011-01-28 13:16:00 -08:00
Dirk Dougherty
30a85ec7e8 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-28 12:00:51 -08:00
Dirk Dougherty
fa809dba8e Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Andreas Huber
70888c00a0 am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-28 10:42:10 -08:00
Andreas Huber
b6c2e2b46c DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
 2011-01-28 09:58:11 -08:00
Eric Laurent
13212f8338 am 0ef57993: Merge "Fix issue 2988031." into gingerbread 
* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.
 2011-01-27 18:40:42 -08:00
Eric Laurent
0ef579939e Merge "Fix issue 2988031." into gingerbread 2011-01-27 18:37:04 -08:00
Jim Miller
145643ca4b am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-27 18:25:12 -08:00
Jim Miller
226e57563c Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 2011-01-27 18:22:14 -08:00