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

53689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
090117774a am d4f9872c: am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit 'd4f9872cb077abc54cfa2def348f831d24e32ca0':
  docs: add info about manifest attributes that should not change
 2011-06-23 14:30:30 -07:00
Raphael Moll
b02367778d am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-23 14:30:25 -07:00
Jerry J. Wang
996bdbaaf0 am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit '4333de2a8e878b319c0e779942b87c042804d352':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-23 14:29:55 -07:00
Scott Main
16d1f17675 am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title 
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
  docs: remove exclamation from media title
 2011-06-23 14:29:50 -07:00
Katie McCormick
c182bd5162 am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit '023622997d886074f7c0cf831945a466803acf5e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-23 14:29:25 -07:00
JP Abgrall
b851cc23c8 NetworkStatsService: check kernel bandwidth support before enabling 
And catch the actual errors reported by the other side of NetworkManager.


Change-Id: I9a9393b659d6f896ee1bf40a8deaca7853ef8f94
Signed-off-by: JP Abgrall <jpa@google.com>
 2011-06-23 14:13:28 -07:00
David Brown
0824b928ce Merge "Update CallerInfo to use the geocoder in the updated location." 2011-06-23 14:08:56 -07:00
Bart Sears
621cbd3feb Add Droid Ethiopic fonts 
Add the Ver 1.02 Droid Ethiopic fonts from Monotype.

Adding to git, but not adding them into the fonts.mk file (to copy
to production builds) until we have Fallback support for multiple
styles (i.e. Regular and Bold).

Change-Id: Id86d6006adf753940d7886dd9a2fd558e2fa2773
 2011-06-23 13:27:20 -07:00
Scott Main
7c58d671d5 am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 
* commit 'f169bae87df61ad91bda0c547a59fdaeda1bed10':
  docs: add emphasis to adding a search button in activity UI
 2011-06-23 13:15:58 -07:00
Scott Main
f169bae87d am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 
* commit 'f8d37ab6b35c6cdd44e833ae4bd65301f2d3543a':
  docs: add emphasis to adding a search button in activity UI
 2011-06-23 13:12:30 -07:00
Scott Main
f8d37ab6b3 Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 2011-06-23 13:08:27 -07:00
Scott Main
72e0df6573 docs: add emphasis to adding a search button in activity UI 
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
 2011-06-23 13:07:26 -07:00
Jamie Gennis
b950b8e23e Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode." 2011-06-23 13:02:40 -07:00
Scott Main
44b48a377d am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit 'db76388e9af0019842ea2cca0b14d11f2e146d1a':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:51:49 -07:00
Dianne Hackborn
83e0bc18e0 DO NOT MERGE. Fix density compat mode. 
Fix issue #4770360: older app compatibility mode is really tiny on ICS phones

We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
 2011-06-23 12:29:03 -07:00
Scott Main
db76388e9a am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:26:33 -07:00
Dianne Hackborn
58b8684177 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Adam Powell
2a08791491 Merge "Fix bug 4904520 - Swap force close/report buttons" 2011-06-23 12:05:50 -07:00
Philip Milne
368c0f900d Merge "Handle baseline aligned rows in which some components define baseline and some don't." 2011-06-23 12:05:09 -07:00
Adam Powell
3187632e0a Fix bug 4904520 - Swap force close/report buttons 
Make the force close dialogs consistent with both the new rules for
wizardy-button bar UI flows and the previous arrangement that people
are used to. Force close = negative/back/cancel, Report =
positive/next/ok.

Change-Id: I212ba172f8076238a1833100b025b6e25a538a65
 2011-06-23 12:02:27 -07:00
Dianne Hackborn
2b31d53161 Fix issue #4770360: older app compatibility mode is really tiny on ICS phones 
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
 2011-06-23 12:00:54 -07:00
Philip Milne
a1f7b10f72 Handle baseline aligned rows in which some components define baseline and some don't. 
Also:

. Make all of the methods in Alignment package private.
. Inlucde Tor's test case

Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
 2011-06-23 11:41:57 -07:00
Adam Powell
8457f0fe34 Merge "Fix bug 4595971 - Menu not prepared to be prepared" 2011-06-23 11:38:10 -07:00
Scott Main
9a05cfe542 docs: update docs for new screen support attributes and qualifiers 
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
 2011-06-23 11:35:07 -07:00
Brian Carlstrom
0ff6d7ee17 Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)" 2011-06-23 10:26:38 -07:00
Andreas Huber
5ecc4601ea Merge "Parse RTP-Info even for live streams." 2011-06-23 10:12:22 -07:00
Andreas Huber
16b501ae09 Merge "Reconstruct sync frame indication for content served by the MPEG2TSExtractor" 2011-06-23 10:12:12 -07:00
Adam Powell
0b2be42a07 Fix bug 4595971 - Menu not prepared to be prepared 
The menu key gets the menu ready on key down and shows it on key
up. Ensure on key up that we still have a valid menu before attempting
to show it.

Change-Id: I24e67fa0cdb14cb5471c087a5e9f55ec0b2edf9f
 2011-06-23 10:11:49 -07:00
Doug Felt
468d8afad2 add TextView page to BiDiTests 
Change-Id: If6ba2d7f96283041d254d6d53bb268d88fed2c74
 2011-06-23 10:01:02 -07:00
Gloria Wang
b59f677611 Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle." 2011-06-23 09:33:11 -07:00
Scott Main
b9d7873cec am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2 
* commit 'a602972c3fbb6a4f115b2cfe95b30fd10572fcb3':
  docs: add Lenevo driver info
 2011-06-23 09:32:58 -07:00
Scott Main
a602972c3f am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2 
* commit '1acd2a7f2b263e9d8de23a0d5630d77efe370c80':
  docs: add Lenevo driver info
 2011-06-23 09:28:34 -07:00
Scott Main
1acd2a7f2b Merge "docs: add Lenevo driver info" into honeycomb-mr2 2011-06-23 09:18:22 -07:00
Glenn Kasten
db262e6cf0 Merge "Fix warnings for uninitialized local variables" 2011-06-23 09:00:03 -07:00
Robert Greenwalt
0e0a759734 am 1d6ffd73: Merge "Restrict access to protected networks." into honeycomb-LTE 
* commit '1d6ffd7339c3dfa53de19e27ca09e57233cc25ef':
  Restrict access to protected networks.
 2011-06-23 08:19:48 -07:00
Scott Main
e847fc24c3 am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 
* commit 'dba7dd71f296a6220cb5a5308221b9ead1b4f106':
  docs: use new CSE to show results for all sites
 2011-06-23 08:17:28 -07:00
Robert Ly
f64d0ef991 am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-23 08:17:23 -07:00
Irfan Sheriff
756f25fc61 am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
  Release wakelock after use
 2011-06-23 08:17:01 -07:00
Bruno Oliveira
f14192bc4f am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-23 08:16:55 -07:00
Irfan Sheriff
e8c01e5c8a am a08c5520: (-s ours) am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit 'a08c55208335a2dfd6642793d6b3cc2e86615282':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-23 08:16:49 -07:00
Irfan Sheriff
4ae8aa9c73 am 5389c80d: (-s ours) am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit '5389c80d1f7c9d2710a47ccf70cce94c2d5d9599':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-23 08:16:44 -07:00
Eric Laurent
e2ac799dfc Merge "Added audio_bytes_per_sample() helper function" 2011-06-23 08:08:20 -07:00
Robert Greenwalt
1d6ffd7339 Merge "Restrict access to protected networks." into honeycomb-LTE 2011-06-23 08:04:48 -07:00
Irfan Sheriff
afd2580afd am 20b6ded6: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '20b6ded6e326e3fedb9f7e112773a82b94c4aca6':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-23 07:50:01 -07:00
Wink Saville
9b897922e1 am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 
* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
  Use dataConnectionNotInUse to decide if a DC is free.
 2011-06-23 07:49:30 -07:00
Wink Saville
3b14c78466 am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 
* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
  Fix handling of unsol_data_state_change with PDP sharing scenario
 2011-06-23 07:49:16 -07:00
Wink Saville
7bfb80d122 am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 
* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
 2011-06-23 07:49:09 -07:00
Wink Saville
b939b4d36a am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 
* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
  Special retry back-off timer in call setup failure.
 2011-06-23 07:49:02 -07:00
Irfan Sheriff
e35446e8f4 am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit 'e8898d4a4441b590c3c6e6336cfbb53fcd853775':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-23 07:48:38 -07:00
Jaikumar Ganesh
6839550fd9 am f50ef6a4: (-s ours) am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'f50ef6a43d721e933fd596113f8ae6644b29f3f5':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-23 07:48:31 -07:00