OSDN Git Service
Scott Main [Wed, 3 Oct 2012 23:50:56 +0000 (16:50 -0700)]
am
4d62456e: resolved conflicts for merge of
f15f8a1b to jb-dev
* commit '
4d62456e211a0b4cd77a8967417340612994cb6c':
add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
Scott Main [Wed, 3 Oct 2012 23:42:06 +0000 (16:42 -0700)]
resolved conflicts for merge of
f15f8a1b to jb-dev
Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa
Scott Main [Wed, 3 Oct 2012 23:38:42 +0000 (16:38 -0700)]
am
25a9144b: Merge "docs: Update design download links" into jb-dev
* commit '
25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc':
docs: Update design download links
Scott Main [Wed, 3 Oct 2012 23:36:21 +0000 (16:36 -0700)]
Merge "docs: Update design download links" into jb-dev
Scott Main [Wed, 3 Oct 2012 23:23:00 +0000 (16:23 -0700)]
Merge "add analytics event tracking for Design downloads, SDK downloads, Badges and Device art." into jb-dev-docs
Scott Main [Wed, 3 Oct 2012 22:23:06 +0000 (15:23 -0700)]
add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
Change-Id: I479b0059678d31fb993f6ddc68f5a7ef5ee26ecc
Scott Main [Wed, 3 Oct 2012 23:17:13 +0000 (16:17 -0700)]
am
b31d0b3b: am
d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
* commit '
b31d0b3b6d0506970adeecd9177e276dd407f418':
re-write the Dialog guide to focus on using DialogFragment
Scott Main [Wed, 3 Oct 2012 23:15:04 +0000 (16:15 -0700)]
am
d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
* commit '
d2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc':
re-write the Dialog guide to focus on using DialogFragment
Scott Main [Wed, 3 Oct 2012 23:12:36 +0000 (16:12 -0700)]
Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs
Roman Nurik [Wed, 3 Oct 2012 20:50:57 +0000 (13:50 -0700)]
docs: Update design download links
This is a manual merge of change I354d5dfd9c8c8843c217767ccb04447b30f79a48
from jb-dev-docs.
Change-Id: I448eca9e6c5a3e4ff9af82e14d713fdf3e99f236
Roman Nurik [Wed, 3 Oct 2012 20:48:49 +0000 (13:48 -0700)]
am
6a54f4e6: am
66ff277f: (-s ours) docs: Update design download links
* commit '
6a54f4e67bbffa743da4273efb6cb5e9df38cfd8':
docs: Update design download links
Roman Nurik [Wed, 3 Oct 2012 20:45:24 +0000 (13:45 -0700)]
am
66ff277f: (-s ours) docs: Update design download links
* commit '
66ff277fbd143c2d5da8c96ecb174ddc6f75562f':
docs: Update design download links
Roman Nurik [Wed, 3 Oct 2012 20:28:27 +0000 (13:28 -0700)]
docs: Update design download links
Change-Id: I354d5dfd9c8c8843c217767ccb04447b30f79a48
Dirk Dougherty [Wed, 3 Oct 2012 08:21:48 +0000 (01:21 -0700)]
am
5958cb0d: am
c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories.
* commit '
5958cb0d8b619b7a42dcc9fbace3b2b9e088e89c':
Doc change: Add core quality and tablet quality docs, tablet developer stories.
Dirk Dougherty [Wed, 3 Oct 2012 08:19:45 +0000 (01:19 -0700)]
am
c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories.
* commit '
c395f4a39cef3e0c2eaac8318b5e1723eac7d696':
Doc change: Add core quality and tablet quality docs, tablet developer stories.
Dirk Dougherty [Mon, 20 Aug 2012 18:07:36 +0000 (11:07 -0700)]
Doc change: Add core quality and tablet quality docs, tablet developer stories.
Change-Id: Ia88e66818200fdc20417c0fe20672a5758284028
Scott Main [Wed, 3 Oct 2012 03:33:19 +0000 (20:33 -0700)]
am
b2e7d79f: am
ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '
b2e7d79f12efca50032512b70ddd79aa74dbbc4f':
update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Wed, 3 Oct 2012 03:31:09 +0000 (20:31 -0700)]
am
ddab47b7: update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '
ddab47b78ca5dff3b9ca8f79c2af8de0292a8fa4':
update sidenav structure for localized strings dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Scott Main [Wed, 3 Oct 2012 00:48:11 +0000 (17:48 -0700)]
update sidenav structure for localized strings
dependent on change Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
Change-Id: I8eaf83c454bb3e4eae4aac11473f371987c29ab1
Scott Main [Tue, 2 Oct 2012 23:20:50 +0000 (16:20 -0700)]
am
33b8f417: am
11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
* commit '
33b8f4175719b746ee290fd95478fae4643fad42':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
Scott Main [Tue, 2 Oct 2012 23:18:19 +0000 (16:18 -0700)]
am
11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
* commit '
11f03b4b694f506ed5dcb7c12a9984b653f93b42':
DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
Scott Main [Fri, 7 Sep 2012 22:26:39 +0000 (15:26 -0700)]
DO NOT MERGE
cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
docs: android training - Data Storage
Change-Id: I62b6d5385355555aa3e184bfd4418a0d2e0c1719
Scott Main [Tue, 2 Oct 2012 22:31:18 +0000 (15:31 -0700)]
am
04c63a40: docs: android training - Data Storage
* commit '
04c63a4098293dd00aeaf561b05a33c04a8d7853':
docs: android training - Data Storage
Scott Main [Fri, 7 Sep 2012 22:26:39 +0000 (15:26 -0700)]
docs: android training - Data Storage
Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
The Android Open Source Project [Tue, 2 Oct 2012 21:47:40 +0000 (14:47 -0700)]
Reconcile with jb-release - do not merge
Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9
Scott Main [Mon, 1 Oct 2012 22:49:15 +0000 (15:49 -0700)]
am
94b94fc5: am
32a1d2db: dashboard update for 10/1
* commit '
94b94fc5b35f3e55574ce8b12b65e46f0144d743':
dashboard update for 10/1
Scott Main [Mon, 1 Oct 2012 22:46:20 +0000 (15:46 -0700)]
am
32a1d2db: dashboard update for 10/1
* commit '
32a1d2dbf9e396ae77bc621ec583c92b6774ed32':
dashboard update for 10/1
Scott Main [Mon, 1 Oct 2012 19:03:09 +0000 (12:03 -0700)]
am
a180cc3c: am
cd579c57: wording tweak to brand guidelines
* commit '
a180cc3c0c33333c07c7c510aef92cee78dab56c':
wording tweak to brand guidelines
Scott Main [Mon, 1 Oct 2012 19:02:24 +0000 (12:02 -0700)]
dashboard update for 10/1
Change-Id: I8930a4830eaa2fba7440832aae51db34ae06f84a
Scott Main [Mon, 1 Oct 2012 19:00:24 +0000 (12:00 -0700)]
am
cd579c57: wording tweak to brand guidelines
* commit '
cd579c57bb7bce23736216905dc2c0a349bf4246':
wording tweak to brand guidelines
Scott Main [Mon, 1 Oct 2012 18:17:54 +0000 (11:17 -0700)]
wording tweak to brand guidelines
Change-Id: Ie1435ac97b6988b74fbcd1e1b29e4ff106492a13
John Wang [Wed, 12 Sep 2012 23:46:41 +0000 (16:46 -0700)]
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
Scott Main [Fri, 28 Sep 2012 22:09:20 +0000 (15:09 -0700)]
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
Scott Main [Fri, 28 Sep 2012 22:05:19 +0000 (15:05 -0700)]
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
Scott Main [Fri, 28 Sep 2012 22:02:28 +0000 (15:02 -0700)]
Merge "updates to the brand guidelines, based on the partner toolkit" into jb-dev-docs
The Android Open Source Project [Fri, 28 Sep 2012 19:53:18 +0000 (12:53 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Icaa1aa21771c3281f508f5c90644f4b9a97c22b9
Christopher Tate [Wed, 26 Sep 2012 22:25:59 +0000 (15:25 -0700)]
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
Scott Main [Wed, 12 Sep 2012 03:47:48 +0000 (20:47 -0700)]
re-write the Dialog guide to focus on using DialogFragment
Change-Id: Ia7812f4dab5d6c3d2f945da009891239b9d8d5e3
Christopher Tate [Fri, 28 Sep 2012 18:32:15 +0000 (11:32 -0700)]
am
64d1f3ef: DO NOT MERGE - Full (local) restore security changes
* commit '
64d1f3efd759b70462aecb6cf1d8c733872a8911':
DO NOT MERGE - Full (local) restore security changes
Christopher Tate [Wed, 26 Sep 2012 22:25:59 +0000 (15:25 -0700)]
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
Xavier Ducrohet [Wed, 26 Sep 2012 22:12:13 +0000 (15:12 -0700)]
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.
Xavier Ducrohet [Thu, 6 Sep 2012 00:49:21 +0000 (17:49 -0700)]
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
Joe Malin [Wed, 26 Sep 2012 19:45:58 +0000 (12:45 -0700)]
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
Joe Malin [Wed, 26 Sep 2012 19:43:38 +0000 (12:43 -0700)]
am
829986a5: Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
* commit '
829986a5f6b46a744f1f9953b8af5bbe849c71a9':
DOC CHANGE: Fix Google Play services page
Joe Malin [Wed, 26 Sep 2012 19:41:42 +0000 (12:41 -0700)]
Merge "DOC CHANGE: Fix Google Play services page" into jb-dev-docs
Joe Malin [Wed, 26 Sep 2012 19:20:24 +0000 (12:20 -0700)]
DOC CHANGE: Fix Google Play services page
Change-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b
Scott Main [Tue, 18 Sep 2012 05:08:57 +0000 (22:08 -0700)]
updates to the brand guidelines, based on the partner toolkit
Change-Id: Ie4ee8b11bc97d00412f48b6086fac72ad5c52006
Dirk Dougherty [Wed, 26 Sep 2012 19:02:47 +0000 (12:02 -0700)]
am
8a58c030: am
8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '
8a58c030e3a56878cac6f449161c8b29d9557006':
Doc change: Update GP services description.
Dirk Dougherty [Wed, 26 Sep 2012 19:00:54 +0000 (12:00 -0700)]
am
8e3dca8d: Merge "Doc change: Update GP services description." into jb-dev-docs
* commit '
8e3dca8d274270d8cb43d0df10787c7409bcc8cc':
Doc change: Update GP services description.
Dirk Dougherty [Wed, 26 Sep 2012 18:58:29 +0000 (11:58 -0700)]
Merge "Doc change: Update GP services description." into jb-dev-docs
Dirk Dougherty [Wed, 26 Sep 2012 18:54:18 +0000 (11:54 -0700)]
Doc change: Update GP services description.
Change-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8
Scott Main [Wed, 26 Sep 2012 18:47:38 +0000 (11:47 -0700)]
am
8bf95ee6: am
ed5ff3bd: add analog clock attributes to docs
* commit '
8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
add analog clock attributes to docs
Scott Main [Wed, 26 Sep 2012 18:45:21 +0000 (11:45 -0700)]
am
ed5ff3bd: add analog clock attributes to docs
* commit '
ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
add analog clock attributes to docs
Scott Main [Wed, 26 Sep 2012 18:42:09 +0000 (11:42 -0700)]
add analog clock attributes to docs
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
Scott Main [Wed, 26 Sep 2012 18:37:38 +0000 (11:37 -0700)]
Scott Main [Wed, 26 Sep 2012 18:34:49 +0000 (11:34 -0700)]
am
14a36625: fix markup bugs
* commit '
14a366255aee79eec81d5a80ec3d8f298af9a938':
fix markup bugs
Scott Main [Wed, 26 Sep 2012 18:22:09 +0000 (11:22 -0700)]
fix markup bugs
Change-Id: I37111431505f7803c2374917b3c186529c6e3d60
Xavier Ducrohet [Wed, 26 Sep 2012 18:03:45 +0000 (11:03 -0700)]
am
6c6ddbff: Fix writing text version of styleable IDs. do not merge.
* commit '
6c6ddbff890afb2133f6da79237cf581f00c13ba':
Fix writing text version of styleable IDs. do not merge.
Xavier Ducrohet [Wed, 26 Sep 2012 17:11:54 +0000 (10:11 -0700)]
Fix writing text version of styleable IDs. do not merge.
(cherry picked from commit
d16047434bca24b2811de7ea9d22de6ee0f87f79)
Change-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a
Scott Main [Wed, 26 Sep 2012 02:05:35 +0000 (19:05 -0700)]
am
4f832bc7: am
3b1c5d55: add tip about including android:id for layout state
* commit '
4f832bc796bad90e5632c3ab69e305b3c7c008ba':
add tip about including android:id for layout state
Scott Main [Wed, 26 Sep 2012 02:03:33 +0000 (19:03 -0700)]
am
3b1c5d55: add tip about including android:id for layout state
* commit '
3b1c5d55517260516bfa5591ca08bb39d336d511':
add tip about including android:id for layout state
Scott Main [Wed, 26 Sep 2012 01:54:15 +0000 (18:54 -0700)]
add tip about including android:id for layout state
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
Joe Fernandez [Wed, 26 Sep 2012 00:57:56 +0000 (17:57 -0700)]
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
Joe Fernandez [Wed, 26 Sep 2012 00:56:43 +0000 (17:56 -0700)]
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
Joe Fernandez [Fri, 24 Aug 2012 19:34:43 +0000 (12:34 -0700)]
cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
docs: Systrace tool documentation
Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
Amith Yamasani [Mon, 24 Sep 2012 15:49:47 +0000 (08:49 -0700)]
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
Amith Yamasani [Mon, 24 Sep 2012 15:45:14 +0000 (08:45 -0700)]
am
5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '
5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
Fixing services start order that impacts ICS - JB upgrade
The Android Open Source Project [Mon, 24 Sep 2012 14:39:06 +0000 (07:39 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
Amith Yamasani [Sun, 23 Sep 2012 23:01:52 +0000 (16:01 -0700)]
Merge "Fixing services start order that impacts ICS - JB upgrade"
John Wang [Wed, 12 Sep 2012 23:46:41 +0000 (16:46 -0700)]
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
Victoria Lease [Thu, 20 Sep 2012 22:09:24 +0000 (15:09 -0700)]
Get your own cursor Drawables, WebViewClassic!
These are shared resources! You can't just animate *everyone's*
cursors!
Bug:
7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
Scott Main [Fri, 21 Sep 2012 23:00:51 +0000 (16:00 -0700)]
Scott Main [Fri, 21 Sep 2012 22:59:04 +0000 (15:59 -0700)]
Scott Main [Fri, 21 Sep 2012 22:55:15 +0000 (15:55 -0700)]
fix layout bug
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
Victoria Lease [Thu, 20 Sep 2012 23:43:25 +0000 (16:43 -0700)]
am
7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
* commit '
7c0edba0ab8803ff63ac006c8aead4fa0d1a15d8':
Get your own cursor Drawables, WebViewClassic!
Joe Fernandez [Thu, 20 Sep 2012 23:43:21 +0000 (16:43 -0700)]
am
bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev
* commit '
bbdfada0a97b779bde0c43b63979bf7edb94d94d':
docs: Systrace tool documentation
Jean-Baptiste Queru [Thu, 20 Sep 2012 23:32:57 +0000 (16:32 -0700)]
Ignore
12496bfc into jb-dev-plus-aosp
Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a
Victoria Lease [Thu, 20 Sep 2012 22:19:05 +0000 (15:19 -0700)]
Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
Joe Fernandez [Thu, 20 Sep 2012 22:13:01 +0000 (15:13 -0700)]
Merge "docs: Systrace tool documentation" into jb-dev
Victoria Lease [Thu, 20 Sep 2012 22:09:24 +0000 (15:09 -0700)]
Get your own cursor Drawables, WebViewClassic!
These are shared resources! You can't just animate *everyone's*
cursors!
Bug:
7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
Xavier Ducrohet [Thu, 20 Sep 2012 20:56:08 +0000 (13:56 -0700)]
Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev
Joe Fernandez [Fri, 24 Aug 2012 19:34:43 +0000 (12:34 -0700)]
docs: Systrace tool documentation
Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
Adam Powell [Wed, 19 Sep 2012 19:21:15 +0000 (12:21 -0700)]
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
Adam Powell [Wed, 19 Sep 2012 18:56:40 +0000 (11:56 -0700)]
am
ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '
ab12f0f72c22143523e2bce7d58d9f1021abde5c':
Implement resolving of icon attributes to resIds in AlertController
Scott Main [Wed, 19 Sep 2012 18:22:02 +0000 (11:22 -0700)]
am
19a39686: am
b79d8ecc: udpate media formats for JB
* commit '
19a39686b7bcf5c47cc0e2f99caca7beb9173212':
udpate media formats for JB
Scott Main [Wed, 19 Sep 2012 18:00:23 +0000 (11:00 -0700)]
am
b79d8ecc: udpate media formats for JB
* commit '
b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
udpate media formats for JB
Adam Powell [Wed, 19 Sep 2012 17:51:40 +0000 (10:51 -0700)]
Merge "Implement resolving of icon attributes to resIds in AlertController"
Scott Main [Tue, 18 Sep 2012 17:40:49 +0000 (10:40 -0700)]
udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
Xavier Ducrohet [Tue, 11 Sep 2012 21:45:22 +0000 (14:45 -0700)]
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
Felipe Ramos [Tue, 18 Sep 2012 21:26:27 +0000 (18:26 -0300)]
Fixing services start order that impacts ICS - JB upgrade
JB has introduced LockSettingsService. When the phone is
upgrading from ICS, that used another way to store lock
settings, the LockSettingsService needs to import these
settings to store in its database. This happens when the
systemReady() method of this class is called by SystemServer.
The problem resides in the fact that the
DevicePolicyManagerService actually needs to access the
LockSettingsService during its systemReady() initialization,
causing invalid values to be read by it which propagates and
ends up causing a invalid return in the method
isActivePasswordSufficient.
If user had a Google corporate account that enforces password
related policies through Google Apps Device Policy (GADP) app
in ICS, when he upgrades to JB, the GADP will throw a
notification saying that the password doesn't meet the required
policies and needs to be changed, incorrectly, since it wasn't
touched during upgrade.
This fix initializes the LockSettingsService before the
DevicePolicyManagerService, which is the correct way since
the latter uses the first in its initialization. This prevents
this issue to happen, and probably future issues, depending
on the way that LockSettingsService evolves.
Change-Id: I3d4334a8b728f0ad9ae744cece430d15af25a0b7
Mike Lockwood [Tue, 18 Sep 2012 17:59:27 +0000 (10:59 -0700)]
am
945080b5: am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
MtpData bmp format file can't recognize when copy bmp into DUT
Mike Lockwood [Tue, 18 Sep 2012 17:53:11 +0000 (10:53 -0700)]
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
Scott Main [Tue, 18 Sep 2012 17:45:23 +0000 (10:45 -0700)]
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
Scott Main [Tue, 18 Sep 2012 17:45:19 +0000 (10:45 -0700)]
am
d67459ff: new Google Play badges and some updates to corresponding pages
* commit '
d67459ff191aaee34d5459960ef8e1fed82f59d5':
new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:45:15 +0000 (10:45 -0700)]
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
Katie McCormick [Tue, 18 Sep 2012 17:45:11 +0000 (10:45 -0700)]
am
ad4bbdf2: am
844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '
ad4bbdf22cc63489b541b9b8f82073e851836780':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Tue, 18 Sep 2012 17:45:07 +0000 (10:45 -0700)]
am
ada4f081: am
61d85c43: add link to device dock lesson
* commit '
ada4f081c641b09f7e3a3c214db868f24df957e9':
add link to device dock lesson
Dirk Dougherty [Tue, 18 Sep 2012 17:45:04 +0000 (10:45 -0700)]
am
2dec9928: am
24a024ec: Doc change: fix typo in JB highlights.
* commit '
2dec992884db8ca54ee814b4c7967c358dcd8212':
Doc change: fix typo in JB highlights.
Scott Main [Tue, 18 Sep 2012 17:45:00 +0000 (10:45 -0700)]
am
a1981bc1: am
d5abc558: docs: update for multi apk doc for ABI support
* commit '
a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
docs: update for multi apk doc for ABI support
Katie McCormick [Tue, 18 Sep 2012 17:44:57 +0000 (10:44 -0700)]
am
917d45e3: am
73ec048e: Doc update: Appwidgets JB additions.
* commit '
917d45e3d1a2d405aa0996889c40554b4a508fe1':
Doc update: Appwidgets JB additions.