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

78217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
04c63a4098 docs: android training - Data Storage 
Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
 2012-10-02 15:06:22 -07:00
Scott Main
94b94fc5b3 am 32a1d2db: dashboard update for 10/1 
* commit '32a1d2dbf9e396ae77bc621ec583c92b6774ed32':
  dashboard update for 10/1
 2012-10-01 15:46:20 -07:00
Scott Main
32a1d2dbf9 dashboard update for 10/1 
Change-Id: I8930a4830eaa2fba7440832aae51db34ae06f84a
 2012-10-01 12:02:43 -07:00
Scott Main
a180cc3c0c am cd579c57: wording tweak to brand guidelines 
* commit 'cd579c57bb7bce23736216905dc2c0a349bf4246':
  wording tweak to brand guidelines
 2012-10-01 12:00:24 -07:00
Scott Main
cd579c57bb wording tweak to brand guidelines 
Change-Id: Ie1435ac97b6988b74fbcd1e1b29e4ff106492a13
 2012-10-01 11:17:54 -07:00
Scott Main
dc3e006982 am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit 'b78c2207a05cee804f225e86c27211ae5b1629ab':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:05:19 -07:00
Scott Main
b78c2207a0 Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 2012-09-28 15:02:28 -07:00
Christopher Tate
64d1f3efd7 DO NOT MERGE - Full (local) restore security changes 
(1) Prevent full restore from creating files/directories that are
    accessible by other applications

(2) Don't restore filesets from "system" packages; i.e. any that runs
    as a special uid, unless they define their own agent for handling
    the restore process.

Bug 7168284

This is a cherry-pick from the originating tree.

Change-Id: I9f39ada3c4c3b7ee63330b015e62745e84ccb58f
 2012-09-27 18:14:55 -07:00
Xavier Ducrohet
f7243dcc61 Add --error-on-failed-insert option to aapt. do not merge. 
The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Cherry-pick from 7714a2429b192c88e134ff67b969121bbaeb5457

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
 2012-09-26 15:05:22 -07:00
Joe Malin
d8104d9b3d am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit '829986a5f6b46a744f1f9953b8af5bbe849c71a9':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:43:38 -07:00
Joe Malin
829986a5f6 Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 2012-09-26 12:41:43 -07:00
Joe Malin
74708d896b DOC CHANGE: Fix Google Play services page 
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
 2012-09-26 12:36:50 -07:00
Scott Main
d401d58e50 updates to the brand guidelines, based on the partner toolkit 
Change-Id: Ie4ee8b11bc97d00412f48b6086fac72ad5c52006
 2012-09-26 12:17:49 -07:00
Dirk Dougherty
8a58c030e3 am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8e3dca8d274270d8cb43d0df10787c7409bcc8cc':
  Doc change: Update GP services description.
 2012-09-26 12:00:54 -07:00
Dirk Dougherty
8e3dca8d27 Merge "Doc change: Update GP services description." into jb-dev-docs 2012-09-26 11:58:30 -07:00
Dirk Dougherty
d2a8a5ecf9 Doc change: Update GP services description. 
Change-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8
 2012-09-26 11:54:18 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs 
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
 2012-09-26 11:45:21 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs 
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
 2012-09-26 11:42:09 -07:00
Scott Main
5464524524 am 14a36625: fix markup bugs 
* commit '14a366255aee79eec81d5a80ec3d8f298af9a938':
  fix markup bugs
 2012-09-26 11:34:49 -07:00
Scott Main
14a366255a fix markup bugs 
Change-Id: I37111431505f7803c2374917b3c186529c6e3d60
 2012-09-26 11:22:09 -07:00
Xavier Ducrohet
6c6ddbff89 Fix writing text version of styleable IDs. do not merge. 
(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a
 2012-09-26 11:00:41 -07:00
Scott Main
4f832bc796 am 3b1c5d55: add tip about including android:id for layout state 
* commit '3b1c5d55517260516bfa5591ca08bb39d336d511':
  add tip about including android:id for layout state
 2012-09-25 19:03:33 -07:00
Scott Main
3b1c5d5551 add tip about including android:id for layout state 
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
 2012-09-25 19:01:09 -07:00
Joe Fernandez
9b5163836c am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit 'e35d9280d6cd5bfca13f9f1c3e8e90636e00c6cf':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 17:56:43 -07:00
Joe Fernandez
e35d9280d6 cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 
docs: Systrace tool documentation

Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
 2012-09-25 17:52:02 -07:00
Scott Main
be676b6cc4 am 4a5425db: fix layout bug 
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
  fix layout bug
 2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2 fix layout bug 
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
 2012-09-21 15:55:15 -07:00
Victoria Lease
7c0edba0ab Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 2012-09-20 15:19:06 -07:00
Joe Fernandez
bbdfada0a9 Merge "docs: Systrace tool documentation" into jb-dev 2012-09-20 15:13:01 -07:00
Victoria Lease
ae2d7324a4 Get your own cursor Drawables, WebViewClassic! 
These are shared resources! You can't just animate *everyone's*
cursors!

Bug: 7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
 2012-09-20 15:09:24 -07:00
Xavier Ducrohet
12496bfc3b Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev 2012-09-20 13:56:09 -07:00
Joe Fernandez
5e3a1c091f docs: Systrace tool documentation 
Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
 2012-09-20 12:59:45 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB 
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
 2012-09-19 00:02:12 -07:00
Xavier Ducrohet
f43f5c7aaa Add --output-text-symbols option to aapt. do not merge. 
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Chery-picked from f5de650ff1e161ea135c828e43515895343d2c0f

Change-Id: I0e08ceb6e4ceb3feb169ce17df21dd35a2505e7f
 2012-09-18 17:02:34 -07:00
Scott Main
edf0ba6e1b am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit '442040208cba3be464d7a180283d72d9ec074def':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-17 21:30:16 -07:00
Scott Main
442040208c cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 
new Google Play badges and some updates to corresponding pages

Change-Id: I8502a47b9d79d9a03a51c7baaacaa454fd63e5a5
 2012-09-17 21:28:14 -07:00
Scott Main
d67459ff19 new Google Play badges and some updates to corresponding pages 
Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468
 2012-09-17 14:15:34 -07:00
Scott Main
b574a264e6 am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit 'b86b7f07d79cae32cda710aa9cc328e7af2c8ccc':
  small update to the ADT installation steps based on new ADT UI
 2012-09-17 11:23:20 -07:00
Katie McCormick
ad4bbdf22c am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '844d2a942ebde7eb1d5abd68505c7a2eb7e2db0a':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-17 11:21:51 -07:00
Scott Main
ada4f081c6 am 61d85c43: add link to device dock lesson 
* commit '61d85c43474da17296b90b3d7fd0f4bd34cdebe8':
  add link to device dock lesson
 2012-09-17 11:21:48 -07:00
Dirk Dougherty
2dec992884 am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '24a024ecaf949601b998a4b0ed3b4d7af6bcd8ba':
  Doc change: fix typo in JB highlights.
 2012-09-17 11:20:19 -07:00
Scott Main
a1981bc1ab am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'd5abc5586e08bedf06f337aefa5a59c014fb7a2e':
  docs: update for multi apk doc for ABI support
 2012-09-17 11:20:16 -07:00
Katie McCormick
917d45e3d1 am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '73ec048e4de50419d2d49907be0acae0893f92ca':
  Doc update: Appwidgets JB additions.
 2012-09-17 11:20:12 -07:00
Scott Main
8a80ac4690 am 54efa69f: older not lower 
* commit '54efa69f5074568f23eb5ff7f15022eece11918c':
  older not lower
 2012-09-17 11:20:09 -07:00
Joe Fernandez
b9b05dfcc1 am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit '8982939d17881c7dcd20459955f3bfcec6e05905':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-17 11:20:06 -07:00
Scott Main
0cc7398ab9 am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit 'd46023d2081c995b2ec61b48b79f2077dfdb36a2':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-17 11:20:05 -07:00
Katie McCormick
2141c06849 am 243170f7: Doc update: Fix typo. 
* commit '243170f759252c99052a903bd0cb33e4d8227aa0':
  Doc update: Fix typo.
 2012-09-17 11:09:16 -07:00
Scott Main
b86b7f07d7 small update to the ADT installation steps based on new ADT UI 2012-09-17 10:58:28 -07:00
Katie McCormick
844d2a942e Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 2012-09-17 10:57:22 -07:00