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

63123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
82a74bbe91 am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
 2012-02-06 16:45:21 -08:00
Xavier Ducrohet
c9bcd33afa am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:44:32 -08:00
Xavier Ducrohet
b1f95c6a93 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:56 -08:00
Xavier Ducrohet
82fc005f57 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:41 -08:00
Xavier Ducrohet
331bb0c393 Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)

Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
 2012-02-06 16:40:03 -08:00
Scott Main
f9bb376bd7 am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'afaec57668551b797505f43d9d9677979dedf0c9':
 2012-02-06 14:15:06 -08:00
Scott Main
dbee29ba55 am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:14:09 -08:00
Scott Main
afaec57668 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:39 -08:00
Jean-Baptiste Queru
33476f7ad1 am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:12:05 -08:00
Scott Main
5a0fe6fc13 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:03 -08:00
Scott Main
a9d9fa723a Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
f79bcd2dd5 am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:09:36 -08:00
Scott Main
cf9fe43ce9 docs: switch from caps to initial-case for device button names 
Change-Id: I2affdf7400fd814e43633806cebebee4c6075b0b
 2012-02-06 14:09:00 -08:00
Jean-Baptiste Queru
52da99fac8 am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:07:31 -08:00
Jean-Baptiste Queru
a081c7b8bc Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00
Scott Main
6f2f42d52a Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-06 13:07:24 -08:00
Scott Main
584156ad29 am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '8e399408724f3d18d48d13194e05a80108216fed':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:21 -08:00
Scott Main
3cab656d38 am 0654994b: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '0654994b9e546c50d84b3a9909f190220df65497':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:04 -08:00
Scott Main
0654994b9e am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:28 -08:00
Scott Main
8e39940872 am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:04 -08:00
Scott Main
4ba15efc5b Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 2012-02-06 13:03:16 -08:00
Scott Main
ed4d1f7dcf docs: add Sony USB VID 
issue 5967572

Change-Id: I5735d15bec6bd85b5fa74300193dfba1c9da6f34
 2012-02-06 13:01:44 -08:00
Xavier Ducrohet
9485ca87ed am b54f371c: am f8aea993: Make aapt ignore tools-related data. 
* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':
 2012-02-06 11:44:19 -08:00
Xavier Ducrohet
3d4db0dc18 am c205a9d6: am f8aea993: Make aapt ignore tools-related data. 
* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.
 2012-02-06 11:42:50 -08:00
Xavier Ducrohet
b54f371cc4 am f8aea993: Make aapt ignore tools-related data. 
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
 2012-02-06 11:41:56 -08:00
Xavier Ducrohet
c205a9d68c am f8aea993: Make aapt ignore tools-related data. 
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
 2012-02-06 11:41:04 -08:00
Xavier Ducrohet
f8aea99385 Make aapt ignore tools-related data. 
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)

Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
 2012-02-06 11:25:28 -08:00
Scott Main
1e148f509e am 2adfc9de: am 633de7ba: docs: fix meta description tag for homepage 
* commit '2adfc9de0390962701535d0c075c4fb8e886d9d8':
 2012-02-01 15:56:56 -08:00
Scott Main
c019983a21 am c78a300c: am 6aaa27fb: docs: fix broken link 
* commit 'c78a300c6abfea859538f4148ddb3311ca06dd7e':
 2012-02-01 15:56:55 -08:00
Scott Main
4e133702ac am be09298e: am 633de7ba: docs: fix meta description tag for homepage 
* commit 'be09298eb708f6acb6af7028fbca28afdf230008':
  docs: fix meta description tag for homepage
 2012-02-01 15:15:10 -08:00
Scott Main
2adfc9de03 am 633de7ba: docs: fix meta description tag for homepage 
* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage
 2012-02-01 15:12:40 -08:00
Scott Main
be09298eb7 am 633de7ba: docs: fix meta description tag for homepage 
* commit '633de7bab9397c4f7591c5514d903305254451b2':
  docs: fix meta description tag for homepage
 2012-02-01 15:12:33 -08:00
Scott Main
931d1daf1a am fb16fdf2: am 6aaa27fb: docs: fix broken link 
* commit 'fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
  docs: fix broken link
 2012-02-01 15:03:15 -08:00
Scott Main
fb16fdf2d1 am 6aaa27fb: docs: fix broken link 
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
 2012-02-01 15:00:49 -08:00
Scott Main
c78a300c6a am 6aaa27fb: docs: fix broken link 
* commit '6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
  docs: fix broken link
 2012-02-01 15:00:30 -08:00
Scott Main
633de7bab9 docs: fix meta description tag for homepage 
Change-Id: Idfbc5e04fcdfc9d4e20c02ae7b1366c566722053
 2012-02-01 14:49:32 -08:00
Scott Main
6aaa27fb8c docs: fix broken link 
Change-Id: I58a082341373370bf97fed49d4d6584b468b4b46
 2012-02-01 14:32:11 -08:00
Scott Main
4f7f2b8bc3 am b49c0355: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1 
* commit 'b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
 2012-02-01 13:54:48 -08:00
Scott Main
3a08035788 am e043db89: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1 
* commit 'e043db892436f643fc2d71df3bc4b2604c556988':
 2012-02-01 13:54:45 -08:00
Scott Main
eea2e9c134 am 13f3c854: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions 
* commit '13f3c854d8fb635fa824a1ba15fe85152fed131e':
 2012-02-01 13:54:43 -08:00
Xia Wang
c8c9ebe868 am 581a3334: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1 
* commit '581a33344485181eb3484ba7bf50ff2b52be6d99':
 2012-02-01 13:54:40 -08:00
Scott Main
b49c0355aa am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1 
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example
 2012-02-01 13:52:21 -08:00
Scott Main
e043db8924 am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1 
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
  docs: dashboard update for feb 1
 2012-02-01 13:52:19 -08:00
Scott Main
13f3c854d8 am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions 
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
  docs: update menu guide with CAB and popup menu, plus many other revisions
 2012-02-01 13:52:17 -08:00
Xia Wang
581a333444 am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1 
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
  Fix a typo in image processing test
 2012-02-01 13:52:13 -08:00
Scott Main
d3747509f5 am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1 
* commit '8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
  docs: fix action bar style example
 2012-02-01 11:58:57 -08:00
Scott Main
8f6b4c52de am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1 
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
  docs: fix action bar style example
 2012-02-01 11:56:23 -08:00
Scott Main
6b3f98b458 Merge "docs: fix action bar style example" into ics-mr1 2012-02-01 11:54:57 -08:00
Scott Main
b6802e7b58 docs: fix action bar style example 
Change-Id: I9e02c3b3ade17c832b97836c03cf023fe6ea9340
 2012-02-01 11:53:03 -08:00
Scott Main
0683d0963b am b43a0f1f: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1 
* commit 'b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
  docs: dashboard update for feb 1
 2012-02-01 11:48:28 -08:00