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

80608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
c0e0d2bf3d Merge "docs: update for multi apk doc for ABI support" into jb-dev 2012-09-11 10:48:16 -07:00
blunden
576e1dff3d Implement resolving of icon attributes to resIds in AlertController 
Platform code using AlertController directly currently has
no way to set the correct theme-specific dialog icon in a
generic way. This adds code to handle such usage.

Change-Id: I48beafa1183e4edf6d5378b3985a7f9be5fcda8b
 2012-09-11 07:26:12 +02:00
Jun Tian
ee309635d2 Fix CacheBitmap crash issue when using H/W UI rendering 
Avoid to access invalid index in CacheBitmap. That will cause the android SDK image cannot be booted up
with H/W GL enabling. This patch is required by both ARM and x86 SDK system image.

Change-Id: I705b7f06915a2338a2f94509486344bfd92b4bfb
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Jackie Wu <jackie.wu@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
 2012-09-11 10:36:28 +08:00
Scott Main
cd3ec7a251 am e9e40b43: Merge "add link to device dock lesson" into jb-dev 
* commit 'e9e40b438e0a9c30df5834cf7f8f069b20789c76':
  add link to device dock lesson
 2012-09-10 16:27:58 -07:00
Scott Main
e9e40b438e Merge "add link to device dock lesson" into jb-dev 2012-09-10 16:26:47 -07:00
Katie McCormick
51740d6d78 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
 2012-09-10 16:20:20 -07:00
Scott Main
c73d67f3f1 add link to device dock lesson 
Change-Id: I7af36f89204d49f2a0a23c33376f2f343f3b1593
 2012-09-10 16:20:08 -07:00
Elliott Hughes
61d09810a7 am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit '3150feef0b27ad34370904eb12875805f6c84e8a':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:11:04 -07:00
Elliott Hughes
3150feef0b am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:09:15 -07:00
Elliott Hughes
bfe1ab8257 Merge "Fix aapt to get expat header files from the approved location." 2012-09-09 15:16:45 -07:00
Elliott Hughes
ee15e15475 Fix aapt to get expat header files from the approved location. 
Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
 2012-09-09 14:45:32 -07:00
The Android Open Source Project
2ff437745e Reconcile with jb-mr0-release - do not merge 
Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a
 2012-09-07 15:21:16 -07:00
Adam Koch
aa98d50950 am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-de 
* commit '6525f7bfcfaf66fe0d549cb3c3d22a751535932e':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
 2012-09-07 13:17:45 -07:00
Adam Koch
6525f7bfcf Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-dev 2012-09-07 13:15:02 -07:00
Katie McCormick
21d8331d61 am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev 
* commit 'ae050d56247257f652fecb71e3f2ed474238e23f':
  Doc update: Appwidgets JB additions.
 2012-09-07 11:08:46 -07:00
Katie McCormick
ae050d5624 Merge "Doc update: Appwidgets JB additions." into jb-dev 2012-09-07 11:06:00 -07:00
Dirk Dougherty
0152a51c46 am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev 
* commit '882b267d189bdbab02e44f7fe87c5c55aa04c493':
  Doc change: fix typo in JB highlights.
 2012-09-07 10:52:37 -07:00
Dirk Dougherty
882b267d18 Merge "Doc change: fix typo in JB highlights." into jb-dev 2012-09-07 10:49:42 -07:00
Dirk Dougherty
6ca8f880bd Doc change: fix typo in JB highlights. 
Change-Id: I807a8ecee5d352c8494154629b92474ba4b0e892
 2012-09-07 10:48:05 -07:00
Scott Main
bd4a708735 docs: update for multi apk doc for ABI support 
Change-Id: I6ef9b7f4bb213dddddcf03b304ffedfd2f9e209b
 2012-09-06 21:53:24 -07:00
Adam Powell
237012641b DO NOT MERGE - Make WebView track focal points more accurately 
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
 2012-09-06 13:35:06 -07:00
Adam Powell
9d9fe3d352 DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold 
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
 2012-09-06 13:34:58 -07:00
Jean-Baptiste Queru
f66603e109 am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit '3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:49:38 -07:00
Jean-Baptiste Queru
3f3ce8adc7 am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:47:29 -07:00
Jean-Baptiste Queru
bf3e62b891 Merge "Make SimpleSessionDescription locale safe" 2012-09-06 11:22:29 -07:00
Jean-Baptiste Queru
657dba9e66 am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:16:09 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:12:17 -07:00
The Android Open Source Project
1d9c5d8f18 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746
 2012-09-06 08:08:54 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Katie McCormick
96ab46039d Doc update: Appwidgets JB additions. 
Change-Id: Id18a1c82a50fc654e383d9acb53ca61073172287
 2012-09-05 13:07:09 -07:00
Jean-Baptiste Queru
342c6bc8e5 am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Scott Main
b693f6a94c am 8f58d381: older not lower 
* commit '8f58d38103bd3ddc68c2b226e80b9f4c60529dae':
  older not lower
 2012-09-05 11:58:55 -07:00
Scott Main
8f58d38103 older not lower 
Change-Id: Idd925213af834d138991fc6237cfe0329f73ad67
 2012-09-05 11:54:05 -07:00
Scott Main
3bcf81dfa4 am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 
* commit '253483dd974302f0d286eacf6f0f8a9ac9258f78':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-05 11:52:57 -07:00
Scott Main
5ba48e12d3 am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 
* commit 'd4107dca294a2e719b6ba3a268b7147d7cc2922f':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-05 11:51:21 -07:00
Scott Main
253483dd97 Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev 2012-09-05 11:50:18 -07:00
Scott Main
d4107dca29 Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev 2012-09-05 11:48:56 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Joe Fernandez
ba4cf3c850 docs: Accessibility DevGuide, Jelly Bean edition 
Change-Id: Idafa0d755c0397b539a6de5b10096abc1c06c2c7
 2012-09-05 11:27:48 -07:00
Jean-Baptiste Queru
11626a91b6 am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '9eb3bd88f14c386c89dd2576c3ca798f2493b0fd':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:04:53 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27 Merge "Revert "Watchdog: Improvement of debuggability"" 2012-09-05 10:55:43 -07:00
Alex Yakavenka
022668bf33 Telephony: Clarify IccCardConstants.State enum 
Change-Id: I57c6704dbefbcca5d1c6b28e72f0fb80bdbea7fc
 2012-09-05 10:10:06 -07:00
Scott Main
395b3936b8 dashboard update for 9/4 
switch to simplified pie charts: codenames for platforms and separate size and density charts

Change-Id: I9b54f19f6a0c66645b4790e090afef4ec70555b0
 2012-09-05 09:34:08 -07:00
Adam Powell
4289b49dd5 am 9f3b0bfd: DO NOT MERGE - Make WebView track focal points more accurately 
* commit '9f3b0bfd0b1d8876c96036a303b3ff72df0e8ad0':
  DO NOT MERGE - Make WebView track focal points more accurately
 2012-09-04 19:49:13 -07:00