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

63757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
fe34006d6f am 05cd296e: Merge "libmedia: Fix build with gcc 4.7" 
* commit '05cd296e713377c216a4ac5b2d421f4ca0343cda':
  libmedia: Fix build with gcc 4.7
 2012-05-24 06:43:50 -07:00
Jean-Baptiste Queru
05cd296e71 Merge "libmedia: Fix build with gcc 4.7" 2012-05-24 06:25:55 -07:00
Jean-Baptiste Queru
cb57f4f6b8 am 7a52ba8a: Merge "Add a new API on DRM Framework for streaming" 
* commit '7a52ba8a0277f4b0c98e581115abc4a13cb47251':
  Add a new API on DRM Framework for streaming
 2012-05-23 14:31:19 -07:00
Jean-Baptiste Queru
7a52ba8a02 Merge "Add a new API on DRM Framework for streaming" 2012-05-23 14:06:54 -07:00
Jean-Baptiste Queru
22136833f9 am d9bde602: Merge "String on Toast notification does not aligned to center" 
* commit 'd9bde6024e87f050c8e29d3b269173340467053a':
  String on Toast notification does not aligned to center
 2012-05-22 14:10:35 -07:00
Jean-Baptiste Queru
d9bde6024e Merge "String on Toast notification does not aligned to center" 2012-05-22 13:52:59 -07:00
Taeho Kim
1ee2a062e0 String on Toast notification does not aligned to center 
If length of the string being showed on Toast is short (less than 8 chars),
it is aligned to left rather than to center.
Added attribute android:layout_gravity="center_horizontal" on the TextView where Toast's message are shown to fix issue.

Change-Id: I77669fd8a11d1ec8f6b082348eb818671ce158bb
Signed-off-by: Taeho Kim <jyte82@gmail.com>
 2012-05-23 02:10:16 +09:00
Jean-Baptiste Queru
ce5b506ef7 am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" 
* commit '64f77c5e312ff0b45a91853f782f112a99df758f':
  stagefright avcenc: Use intptr_t for casting pointers to integers
 2012-05-21 14:52:48 -07:00
Jean-Baptiste Queru
7bce428ccc am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting" 
* commit '6fd507b92746481f63922059697226c8ec6ad72b':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
 2012-05-21 14:52:45 -07:00
Jean-Baptiste Queru
64f77c5e31 Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" 2012-05-21 14:12:56 -07:00
Jean-Baptiste Queru
6fd507b927 Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting" 2012-05-21 14:12:49 -07:00
Raphael Moll
8748399f6f am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var." 
* commit '613945011ef9f79388a1cf21acf514154e2d5af2':
  Support a new ANDROID_AAPT_IGNORE env var.
 2012-05-18 16:00:04 -07:00
Jean-Baptiste Queru
2a9b85d7cc am c0f17383: Merge "Move kxml2 to prebuilts/misc" 
* commit 'c0f17383579cf49f897fdd1d55aaf44b8d6be0da':
  Move kxml2 to prebuilts/misc
 2012-05-18 16:00:00 -07:00
Raphael Moll
613945011e Merge "Support a new ANDROID_AAPT_IGNORE env var." 2012-05-18 13:00:31 -07:00
Jean-Baptiste Queru
c0f1738357 Merge "Move kxml2 to prebuilts/misc" 2012-05-18 09:51:04 -07:00
Raphael Moll
90897ed87b Support a new ANDROID_AAPT_IGNORE env var. 
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

SDK Bug: 5343 24067

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
 2012-05-09 21:16:26 -07:00
Christopher Tate
798006e470 am ad3f86a5: Merge "Fixed x86 GCC 4.6 compilation error about unused variable" 
* commit 'ad3f86a526c49ecd733564771b5c2ce7eade2a96':
  Fixed x86 GCC 4.6 compilation error about unused variable
 2012-05-09 20:19:03 -07:00
Christopher Tate
ad3f86a526 Merge "Fixed x86 GCC 4.6 compilation error about unused variable" 2012-05-09 14:12:59 -07:00
Andrew Hsieh
1f57f6e0de Fixed x86 GCC 4.6 compilation error about unused variable 
Change-Id: I97a24cc25f71db4e61e9d93cd64a51bb16d2e09a
 2012-05-08 12:31:23 -07:00
Conley Owens
ee50eec00c am a10cc893: Merge "Revert "Telephony: Register/Unregister Phones with CallManager"" 
* commit 'a10cc893f7e1f21783ea60c50a49401181611027':
  Revert "Telephony: Register/Unregister Phones with CallManager"
 2012-05-04 18:13:20 -07:00
Conley Owens
356ca03c10 am 6a1dca3e: Merge "Telephony: Register/Unregister Phones with CallManager" 
* commit '6a1dca3e1c863a3d2db654a1b9fb7156fb3da00d':
  Telephony: Register/Unregister Phones with CallManager
 2012-05-04 18:13:17 -07:00
Jean-Baptiste Queru
acb5f383ea am 4b27125d: Merge changes Ib28636e6,I93ebc433 
* commit '4b27125d8881924f003dfc70f46b21ab5d57f2a8':
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset
 2012-05-04 18:13:14 -07:00
Conley Owens
a10cc893f7 Merge "Revert "Telephony: Register/Unregister Phones with CallManager"" 2012-05-04 17:56:14 -07:00
Conley Owens
6a0f525a16 Revert "Telephony: Register/Unregister Phones with CallManager" 
This reverts commit cbca38522ca90322cfc9ccbb7872586807bf6c48
 2012-05-04 17:41:32 -07:00
Conley Owens
6a1dca3e1c Merge "Telephony: Register/Unregister Phones with CallManager" 2012-05-04 17:40:56 -07:00
Jean-Baptiste Queru
4b27125d88 Merge changes Ib28636e6,I93ebc433 
* changes:
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset
 2012-05-04 11:05:44 -07:00
Jean-Baptiste Queru
cd9adbcea0 am 00f94e88: Merge "Enable chromium http stack for x86" 
* commit '00f94e88f96ed87c95ea65563396609c61e72dca':
  Enable chromium http stack for x86
 2012-05-03 15:14:56 -07:00
Jean-Baptiste Queru
00f94e88f9 Merge "Enable chromium http stack for x86" 2012-05-03 09:02:15 -07:00
Jun Tian
ba71cdcba4 Enable chromium http stack for x86 
Use chromium http stack as the online media http stack for x86 platform.

Change-Id: I16a7a8697127a51fab8105833f7463911852f0b3
 2012-05-02 15:12:45 +08:00
Jean-Baptiste Queru
78821e8e22 am 1b34c1bc: Merge "stagefright: Remove useless declarations" 
* commit '1b34c1bc240e6c2e085eee2b03c728b56b049e23':
  stagefright: Remove useless declarations
 2012-05-01 15:37:18 -07:00
Jean-Baptiste Queru
1b34c1bc24 Merge "stagefright: Remove useless declarations" 2012-05-01 14:48:06 -07:00
Jean-Baptiste Queru
63d944d62e am 93a8225e: Merge "Improve robustness of resource overlay test suite." 
* commit '93a8225e54da124807734ff8e4c7790158d06b7c':
  Improve robustness of resource overlay test suite.
 2012-05-01 09:43:31 -07:00
Jean-Baptiste Queru
13c04786ce am b2228eb7: Merge "Runtime resource overlay: clean-up." 
* commit 'b2228eb7141354089f974a4db3b5224a0ad75fd4':
  Runtime resource overlay: clean-up.
 2012-05-01 09:43:28 -07:00
Jean-Baptiste Queru
bc2fb7b92e am 9e3bc3f6: Merge "Build overlay packages just like regular packages." 
* commit '9e3bc3f61df541271c8a1dfc5564cab853951aec':
  Build overlay packages just like regular packages.
 2012-05-01 09:43:25 -07:00
Jean-Baptiste Queru
93a8225e54 Merge "Improve robustness of resource overlay test suite." 2012-05-01 09:20:47 -07:00
Jean-Baptiste Queru
b2228eb714 Merge "Runtime resource overlay: clean-up." 2012-05-01 09:20:32 -07:00
Jean-Baptiste Queru
ede38b5c6c am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 
* commit '6a8186fb88455fcc418def0650b7b9f8f3573153':
  Fixed group and child view caching in SimpleExpandableListAdapter.
 2012-05-01 08:50:24 -07:00
Jean-Baptiste Queru
8f2e753be2 am cbc71bd7: Merge "Fix off-by-one error when filtering application UIDs" 
* commit 'cbc71bd73fb5eb674e0213b8713d330501d4cec7':
  Fix off-by-one error when filtering application UIDs
 2012-05-01 08:50:21 -07:00
Jean-Baptiste Queru
e28ccbab9a am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 
* commit '7a0829850ee8d1ee2f436c40c8a5af2ff7d96533':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".
 2012-05-01 08:50:18 -07:00
Jean-Baptiste Queru
9e3bc3f61d Merge "Build overlay packages just like regular packages." 2012-05-01 08:49:38 -07:00
Jean-Baptiste Queru
50bd9d6166 am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery." 
* commit '4426961e7b2eb7733dbb0661c47c6aea2f2f7e75':
  Avoiding horizontal keypad navigation trapping within gallery.
 2012-05-01 06:44:11 -07:00
Jean-Baptiste Queru
31ab51a369 am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items." 
* commit '2066f7d9864d46858588a839a7f39a1526c737bc':
  Prevent empty overflow popup when there are no overflow items.
 2012-05-01 06:44:08 -07:00
Jean-Baptiste Queru
415b812569 am d805c677: Merge "Possible NullPointerException in restorePanelState" 
* commit 'd805c67749e7bc80d77028ffa3b58de3b04f621b':
  Possible NullPointerException in restorePanelState
 2012-05-01 06:44:05 -07:00
Jean-Baptiste Queru
f59d291235 am bfe71c35: Merge "statistics from some cpus don\'t fit" 
* commit 'bfe71c35a836e14b7a9f58d90f26fd187df82b06':
  statistics from some cpus don't fit
 2012-05-01 06:44:01 -07:00
Jean-Baptiste Queru
6a8186fb88 Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 2012-05-01 06:43:03 -07:00
Jean-Baptiste Queru
cbc71bd73f Merge "Fix off-by-one error when filtering application UIDs" 2012-05-01 06:42:36 -07:00
Jean-Baptiste Queru
7a0829850e Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 2012-05-01 06:42:12 -07:00
Jean-Baptiste Queru
4426961e7b Merge "Avoiding horizontal keypad navigation trapping within gallery." 2012-05-01 05:52:22 -07:00
Jean-Baptiste Queru
2066f7d986 Merge "Prevent empty overflow popup when there are no overflow items." 2012-05-01 05:52:12 -07:00
Jean-Baptiste Queru
d805c67749 Merge "Possible NullPointerException in restorePanelState" 2012-05-01 05:52:00 -07:00