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

49827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
81cbc294dd Merge "docs: fixing new superscript for rs" into honeycomb-mr2 2011-06-27 11:45:41 -07:00
Robert Ly
491a6de28d docs: fixing new superscript for rs 
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
 2011-06-27 10:33:01 -07:00
Anirudh Dewani
cf33a02bef am 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2 
* commit '3ba39ef20fdbe4512d3c3ad6ad7c833b14318391':
  Typo in spinner tutorial.
 2011-06-27 04:33:59 -07:00
Anirudh Dewani
3ba39ef20f am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2 
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.
 2011-06-26 23:06:04 -07:00
Anirudh Dewani
1f82dc08f1 Merge "Typo in spinner tutorial." into honeycomb-mr2 2011-06-26 23:02:56 -07:00
Dianne Hackborn
06ca9b90e6 am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:43:44 -07:00
Dianne Hackborn
fa5e3b658f am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:26:17 -07:00
Jean-Baptiste Queru
ec5039b372 am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 12:20:24 -07:00
Jean-Baptiste Queru
9f1ef6d57b am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
  Tweak for forward-compatibility
 2011-06-24 12:20:10 -07:00
Dianne Hackborn
2dafe771bb Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 2011-06-24 12:13:16 -07:00
Jean-Baptiste Queru
99c070d8eb am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 11:33:46 -07:00
Jean-Baptiste Queru
7595e84d3a am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility
 2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
4fea5373d3 Merge "Add WEBP to the list of Image formats that support Compression." 2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
f458d5fdb8 Merge "Tweak for forward-compatibility" 2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
0fe0e7a4cb Tweak for forward-compatibility 
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
 2011-06-24 10:49:18 -07:00
Anirudh Dewani
9b375068ac Typo in spinner tutorial. 
Change-Id: I2bacd7b417c21944703738cd410dc1ec67c1b554
 2011-06-24 16:30:20 +05:30
Wink Saville
7eff4bb3f9 am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE 
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO
 2011-06-23 18:25:38 -07:00
Wink Saville
f49e4d3f18 Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE 2011-06-23 18:21:36 -07:00
Kazuhiro Ondo
1ccb10e25d Temporary re-enabling iface name change handling on HO 
Temporary accept interface name change in ConnectivityService.
See bug/4455071.

Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
 2011-06-23 14:58:50 -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
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
Scott Main
9a05cfe542 docs: update docs for new screen support attributes and qualifiers 
Change-Id: I8fdfd90e5d7970bdbb72e0b3271f047f5ed300ee
 2011-06-23 11:35:07 -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
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
Robert Greenwalt
1d6ffd7339 Merge "Restrict access to protected networks." into honeycomb-LTE 2011-06-23 08:04:48 -07:00
Martin Storsjo
21fc9ad28e stagefright amrwbenc: Remove a duplicate, unused file 
This file is identical to common/cmnMemory.c, and that's the
file that is used by all the makefiles, not this one.

Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
 2011-06-23 12:20:12 +03:00
Vikas Arora
2305ac9e4a Add WEBP to the list of Image formats that support Compression. 
Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.

Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
 2011-06-23 13:11:13 +05:30
Scott Main
d4f9872cb0 am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit 'dc0ae0cb9752c6d6150593da2dccf39abbe6b095':
  docs: add info about manifest attributes that should not change
 2011-06-22 18:13:03 -07:00
Raphael Moll
f9705ef6d3 am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 18:05:22 -07:00
Scott Main
dc0ae0cb97 am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change
 2011-06-22 17:53:12 -07:00
Scott Main
138836adc7 Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2 2011-06-22 17:45:13 -07:00
Raphael Moll
2b5f2d0155 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Raphael Moll
e2b41b0d5c Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Robert Greenwalt
50393202f3 Restrict access to protected networks. 
Some networks should only be brought up and controlled by system apps.

bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
 2011-06-22 16:35:12 -07:00
Scott Main
9fc3579cab docs: add info about manifest attributes that should not change 
Change-Id: Ia58d855ccaa3348bc0a2f7a4b7847ec115c442e8
 2011-06-22 15:57:37 -07:00
Jerry J. Wang
4333de2a8e am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit 'a5342f1a63559e03b64b93c36b3b1e4b69d2990f':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-22 15:15:31 -07:00
Jerry J. Wang
a5342f1a63 am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit '850aaaeff6df3c1c6e9cec5ae67225bb57728e0e':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-22 15:11:04 -07:00
Jerry J. Wang
850aaaeff6 Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 2011-06-22 15:08:25 -07:00
Scott Main
d65fab3de6 am e2f74aec: am 929cba13: docs: remove exclamation from media title 
* commit 'e2f74aeca91ae514510f7ee1828eff43b3a2d0f7':
  docs: remove exclamation from media title
 2011-06-22 14:58:04 -07:00
Katie McCormick
023622997d am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit 'a108223fb6a622d977c90b1097f71c867238619e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-22 14:49:03 -07:00
Scott Main
e2f74aeca9 am 929cba13: docs: remove exclamation from media title 
* commit '929cba1391432eb66329781c866c92a07d3f45ae':
  docs: remove exclamation from media title
 2011-06-22 14:46:43 -07:00
Katie McCormick
a108223fb6 am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit 'd4fac2c0263fda4b20f253edd594cf909e61eb4e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-22 14:43:36 -07:00
Scott Main
929cba1391 docs: remove exclamation from media title 
Change-Id: If89584a6b52c6a0e70e6636e1da260b47c0ca072
 2011-06-22 14:43:14 -07:00