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

87030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
f7e2e40079 am f5c717a9: am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit 'f5c717a96ce3efb4a451433dd85af80283f56934':
  Doc update: Fix typo.
 2012-09-18 10:57:00 -07:00
Scott Main
963b2505b9 am 5c97d966: am 9ae01846: fix broken link for action bar pack 
* commit '5c97d966cc0e555bbf0abf4a6517d8d2c3934c72':
  fix broken link for action bar pack
 2012-09-18 10:56:54 -07:00
Mike Lockwood
945080b5b6 am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 10:53:11 -07:00
Fabrice Di Meglio
b250e94fdc Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 2012-09-18 10:47:07 -07:00
Scott Main
a59b1dacd7 am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit 'edf0ba6e1b6de8f43880267862e43ee461901c25':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-18 10:45:23 -07:00
Scott Main
3ce6b0085a am d67459ff: new Google Play badges and some updates to corresponding pages 
* commit 'd67459ff191aaee34d5459960ef8e1fed82f59d5':
  new Google Play badges and some updates to corresponding pages
 2012-09-18 10:45:19 -07:00
Scott Main
fe7e473d05 am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit 'b574a264e687385a236a42d3c95d00825845c820':
  small update to the ADT installation steps based on new ADT UI
 2012-09-18 10:45:15 -07:00
Katie McCormick
04afdd68f3 am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit 'ad4bbdf22cc63489b541b9b8f82073e851836780':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-18 10:45:11 -07:00
Scott Main
6c47d0a9ff am ada4f081: am 61d85c43: add link to device dock lesson 
* commit 'ada4f081c641b09f7e3a3c214db868f24df957e9':
  add link to device dock lesson
 2012-09-18 10:45:07 -07:00
Dirk Dougherty
880051db77 am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '2dec992884db8ca54ee814b4c7967c358dcd8212':
  Doc change: fix typo in JB highlights.
 2012-09-18 10:45:04 -07:00
Scott Main
08ec998bb3 am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
  docs: update for multi apk doc for ABI support
 2012-09-18 10:45:00 -07:00
Katie McCormick
0a94b84def am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '917d45e3d1a2d405aa0996889c40554b4a508fe1':
  Doc update: Appwidgets JB additions.
 2012-09-18 10:44:57 -07:00
Scott Main
21c5007ed4 am 8a80ac46: am 54efa69f: older not lower 
* commit '8a80ac469050135ce2c126bc690e352522b7cee3':
  older not lower
 2012-09-18 10:44:53 -07:00
Joe Fernandez
77ae2e6f27 am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 10:44:50 -07:00
Scott Main
db6313ceba am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 10:44:46 -07:00
Katie McCormick
f5c717a96c am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit '2141c06849cb5b2f5bea06a79de66b7de4112ac9':
  Doc update: Fix typo.
 2012-09-18 10:44:42 -07:00
Scott Main
5c97d966cc am 9ae01846: fix broken link for action bar pack 
* commit '9ae018462a5fa44e3e1d4837942b5fd880531124':
  fix broken link for action bar pack
 2012-09-18 10:44:32 -07:00
Adam Powell
2fafa96eda am e31634e9: am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'e31634e9be7118cab710a614ab44f070712dc560':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:34:33 -07:00
Jean-Baptiste Queru
1acabd9140 am 9ae7fce1: am 45291466: am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony 
* commit '9ae7fce1971fbc63ceb307c7d42f0a050a33d640':
  Show plmn in emergency call allowed mode.
 2012-09-18 10:28:33 -07:00
Adam Powell
e31634e9be am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'a4b0e5590dc303df68256254f732ef632e6912f3':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:27:17 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Adam Powell
a4b0e5590d Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 2012-09-18 10:25:00 -07:00
Adam Powell
8b1821979b Use a larger scaling span for larger screen devices. 
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
 2012-09-18 10:23:43 -07:00
Baligh Uddin
10ee0404af Import translations. DO NOT MERGE 
Change-Id: I9f48dc9210eff95ef753a7743920dec4558496db
Auto-generated-cl: translation import
 2012-09-18 10:17:10 -07:00
Jean-Baptiste Queru
9ae7fce197 am 45291466: am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony 
* commit '4529146642f32c645f9d1be81e9527991e3fd932':
  Show plmn in emergency call allowed mode.
 2012-09-18 10:16:45 -07:00
Marco Nelissen
dfaff890d0 am 22dcf69e: am c5a6cdeb: Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 
* commit '22dcf69eccb92e7280a0a2476cf382e4d5b30637':
  Visualizer only works on sounds >5 sec.
 2012-09-18 10:14:34 -07:00
Andy McFadden
ea2c7b6bdc am fa057e68: am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 
* commit 'fa057e68d0882722769451f326cd17dac2ae3832':
  Plumb display name into SurfaceFlinger
 2012-09-18 10:14:30 -07:00
Nick Kralevich
051cf930d9 am d9ad5d0d: am 96b6cf9e: Merge "Adjust FAQ." into jb-mr1-dev 
* commit 'd9ad5d0d7ae2909ebbc4a6c0865774654bf6f25e':
  Adjust FAQ.
 2012-09-18 10:14:27 -07:00
Marco Nelissen
1116524d50 am 6e5badf6: am 4dff2ab5: Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 
* commit '6e5badf6d433fb935df67aa7739b40c97c13e4ab':
  Activity.onStop(Bundle) does not exist
 2012-09-18 10:14:23 -07:00
Marco Nelissen
22dcf69ecc am c5a6cdeb: Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 
* commit 'c5a6cdeb14c5112e9c418fe7bf4a3c15740629e4':
  Visualizer only works on sounds >5 sec.
 2012-09-18 10:10:35 -07:00
Andy McFadden
fa057e68d0 am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 
* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
  Plumb display name into SurfaceFlinger
 2012-09-18 10:10:21 -07:00
Nick Kralevich
d9ad5d0d7a am 96b6cf9e: Merge "Adjust FAQ." into jb-mr1-dev 
* commit '96b6cf9eb0dd3a33d332c48c7900b60d38f4eef5':
  Adjust FAQ.
 2012-09-18 10:10:18 -07:00
Marco Nelissen
6e5badf6d4 am 4dff2ab5: Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 
* commit '4dff2ab52bb36f532954a5fc92df1b524e067a82':
  Activity.onStop(Bundle) does not exist
 2012-09-18 10:10:10 -07:00
Baligh Uddin
4685851e66 Import translations. DO NOT MERGE 
Change-Id: I0e71a652b8116f4b50e2853dfe9d46f1489b6321
Auto-generated-cl: translation import
 2012-09-18 10:07:20 -07:00
Jean-Baptiste Queru
4529146642 am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony 
* commit '7f5de0161b4df9fc8ed817b10a258668ec7513a2':
  Show plmn in emergency call allowed mode.
 2012-09-18 10:07:09 -07:00
Marco Nelissen
c5a6cdeb14 Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 2012-09-18 09:44:56 -07:00
Andy McFadden
923c18b142 Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 2012-09-18 09:23:30 -07:00
Nick Kralevich
96b6cf9eb0 Merge "Adjust FAQ." into jb-mr1-dev 2012-09-18 09:22:00 -07:00
Marco Nelissen
af68e7c5f5 Visualizer only works on sounds >5 sec. 
Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file  to be longer
than 5 seconds.
b/4571740
b/7173543
b/7173545
b/7175623

Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
 2012-09-18 09:19:55 -07:00
Jean-Baptiste Queru
7f5de0161b Skip f5cbd762 - it's in frameworks/opt/telephony 
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
 2012-09-18 08:01:17 -07:00
Marco Nelissen
4dff2ab52b Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 2012-09-18 07:58:37 -07:00
Amith Yamasani
6625f4dfd9 am 3034558e: am 68d78978: Merge "Fix build - current.txt regenerated" into jb-mr1-dev 
* commit '3034558ec5dea4314812f76924ba8cd1a3dfc3a6':
  Fix build - current.txt regenerated
 2012-09-18 00:10:34 -07:00
Amith Yamasani
5d6d74202f am a6760474: am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'a6760474f751a1b9659f7a932a8debb09068fbe9':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-18 00:10:31 -07:00
Jim Miller
b7555d8e94 am 433e0b2e: am 931be0ee: Merge "Don\'t show empty widget in the case where a widget can\'t be inflated" into jb-mr1-dev 
* commit '433e0b2ee9bd424befd3222b7151f5b438e4c130':
  Don't show empty widget in the case where a widget can't be inflated
 2012-09-18 00:10:27 -07:00
Irfan Sheriff
ed9f9f2569 am caef59af: am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit 'caef59afdda60b5d16a74fffdb98947b1e56fdb1':
  Disable notification scans when p2p is connected
 2012-09-18 00:10:23 -07:00
Dave Burke
ff4dccbe94 am 3d41de1e: am 34436026: Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev 
* commit '3d41de1e172311066805186bcb80fc5e52fd7fab':
  Revert "Increase idle time out to 25s"
 2012-09-18 00:10:20 -07:00
Dave Burke
054e3a1aa6 am 08980a1f: am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 
* commit '08980a1f902a4ac8d485df91f8186598fc49043a':
  Revert "Specify max go intent for wifi display"
 2012-09-18 00:10:16 -07:00
Dianne Hackborn
03f2abecae am 596115b1: am c535d2f3: Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 
* commit '596115b132c9c84f45088cc3cbd5aba9abe3c678':
  Fix dumb bug merging receivers for multiple users.
 2012-09-18 00:10:12 -07:00
Eric Laurent
b653ec8388 am c250e1ed: am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit 'c250e1ed699864462ed1ace5dea22e09f117515b':
  Update headphone volume safety warning message.
 2012-09-18 00:10:08 -07:00
Dianne Hackborn
fb67743848 am 20f8c730: am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit '20f8c730a4d83a01ac92fc3f82129d523b4bc3ef':
  Fix API review bugs.
 2012-09-18 00:10:04 -07:00