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
ef6130d6fa am dc3e0069: am b78c2207: Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs 
* commit 'dc3e0069827289c77e769e2d1861f0e1520f7693':
  updates to the brand guidelines, based on the partner toolkit
 2012-09-28 15:09:20 -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
The Android Open Source Project
7e8c613f82 Reconcile with jb-mr0-release - do not merge 
Change-Id: Icaa1aa21771c3281f508f5c90644f4b9a97c22b9
 2012-09-28 12:53:18 -07:00
Christopher Tate
4873a480f6 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-28 12:00:38 -07:00
Christopher Tate
ad8bda219e am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes 
* commit '64d1f3efd759b70462aecb6cf1d8c733872a8911':
  DO NOT MERGE - Full (local) restore security changes
 2012-09-28 11:32:15 -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
46cc524a6c am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge. 
* commit 'f7243dcc616bc9bd84fa519356babb15d6f17e7d':
  Add --error-on-failed-insert option to aapt. do not merge.
 2012-09-26 15:12:13 -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
44c564f251 am d8104d9b: am 829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs 
* commit 'd8104d9b3debad8c960a302972488e5157702618':
  DOC CHANGE: Fix Google Play services page
 2012-09-26 12:45:58 -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
6aba1d7bb9 am 8a58c030: am 8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs 
* commit '8a58c030e3a56878cac6f449161c8b29d9557006':
  Doc change: Update GP services description.
 2012-09-26 12:02:47 -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
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs 
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
 2012-09-26 11:47:38 -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
16eb53668b am 54645245: am 14a36625: fix markup bugs 
* commit '5464524524ce40af3e421e2d1c9bf810605ae43a':
  fix markup bugs
 2012-09-26 11:37:38 -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
4649d03b96 am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit '6c6ddbff890afb2133f6da79237cf581f00c13ba':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:03:45 -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
82e7fdfd47 am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '4f832bc796bad90e5632c3ab69e305b3c7c008ba':
  add tip about including android:id for layout state
 2012-09-25 19:05:35 -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
c80188ebef am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit '9b5163836ccf121af89040c1e465a3f96d37aa7b':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 17:57:56 -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
Amith Yamasani
814f5ac3a1 am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" 
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 08:49:47 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" 
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 08:45:14 -07:00
The Android Open Source Project
a07cbb96f3 Reconcile with jb-mr0-release - do not merge 
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
 2012-09-24 07:39:06 -07:00
Amith Yamasani
5e8cbdc0bd Merge "Fixing services start order that impacts ICS - JB upgrade" 2012-09-23 16:01:53 -07:00
John Wang
199bc563e3 Show plmn in emergency call allowed mode. 
When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.

bug:7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
 2012-09-21 18:04:24 -07:00
Victoria Lease
a9d7d853d1 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-21 18:04:07 -07:00
Scott Main
2e6428668c am be676b6c: am 4a5425db: fix layout bug 
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
  fix layout bug
 2012-09-21 16:00:51 -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
4feac67048 am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 
* commit '7c0edba0ab8803ff63ac006c8aead4fa0d1a15d8':
  Get your own cursor Drawables, WebViewClassic!
 2012-09-20 16:43:25 -07:00
Joe Fernandez
c098ff668b am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'bbdfada0a97b779bde0c43b63979bf7edb94d94d':
  docs: Systrace tool documentation
 2012-09-20 16:43:21 -07:00
Jean-Baptiste Queru
fea72d3b1a Ignore 12496bfc into jb-dev-plus-aosp 
Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a
 2012-09-20 16:33:09 -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
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:21:15 -07:00