OSDN Git Service
Geremy Condra [Wed, 10 Oct 2012 04:37:23 +0000 (21:37 -0700)]
am
c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit '
c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
DO NOT MERGE Control access to inherited methods of jsinterface objects
Geremy Condra [Wed, 10 Oct 2012 04:32:08 +0000 (21:32 -0700)]
Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
Geremy Condra [Wed, 10 Oct 2012 04:34:33 +0000 (21:34 -0700)]
am
a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit '
a22000d244915df2098619be5fd66bf1c4d019c8':
DO NOT MERGE remove defunct javascript interface
Geremy Condra [Wed, 10 Oct 2012 04:32:00 +0000 (21:32 -0700)]
Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
Selim Gurun [Tue, 4 Sep 2012 23:45:53 +0000 (16:45 -0700)]
DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug:
7073422
Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.
Clean cherry pick of
94740e6c333a109be7516abbd17dd418f23b4f0c
Provided @JavascriptInterface to methods that are accessible from
js.
Clean cherry pick of
b743a23fc5bce9965c1539c3c8611614424a5aff
Add a glue logic to require use of annotations in injected accessibility
objects.
Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
Dirk Dougherty [Wed, 10 Oct 2012 00:36:26 +0000 (17:36 -0700)]
am
137b8f4c: am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 00:33:52 +0000 (17:33 -0700)]
am
f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs
* commit '
f761a9a634a43662525d9c0c537ac5499263fd81':
Doc change: edits to TV tablet story.
Dirk Dougherty [Wed, 10 Oct 2012 00:31:34 +0000 (17:31 -0700)]
Merge "Doc change: edits to TV tablet story." into jb-dev-docs
Dirk Dougherty [Tue, 9 Oct 2012 22:52:13 +0000 (15:52 -0700)]
am
28a40e01: am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
28a40e01fec9e00c74e52a88a5f6fca98057af91':
Doc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:50:12 +0000 (15:50 -0700)]
am
aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
* commit '
aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
Doc change: Link to AVDs docs from tablet quality checklist.
Dirk Dougherty [Tue, 9 Oct 2012 22:48:34 +0000 (15:48 -0700)]
Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs
Dirk Dougherty [Tue, 9 Oct 2012 22:43:10 +0000 (15:43 -0700)]
Doc change: Link to AVDs docs from tablet quality checklist.
Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e
Robert Ly [Tue, 9 Oct 2012 18:40:34 +0000 (11:40 -0700)]
am
f19e4b42: Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
* commit '
f19e4b420de65306f09c199829e7e06fe210e21d':
docs: nfc ndef helper methods bug
5957772
Robert Ly [Tue, 9 Oct 2012 18:38:00 +0000 (11:38 -0700)]
Merge "docs: nfc ndef helper methods bug
5957772" into jb-dev
Dirk Dougherty [Tue, 9 Oct 2012 17:36:43 +0000 (10:36 -0700)]
am
b049b1ef: am
46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '
b049b1ef81d301359444b6b18671a513373ba221':
Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Tue, 9 Oct 2012 17:33:53 +0000 (10:33 -0700)]
am
46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '
46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
Doc change: Subscriptions free trials on Google Play.
Dirk Dougherty [Sun, 7 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Doc change: Subscriptions free trials on Google Play.
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
Robert Ly [Tue, 28 Feb 2012 21:05:50 +0000 (13:05 -0800)]
docs: nfc ndef helper methods bug
5957772
Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e
Selim Gurun [Wed, 5 Sep 2012 18:53:44 +0000 (11:53 -0700)]
DO NOT MERGE remove defunct javascript interface
Bug:
7073422
The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.
Clean cherry pick of
d773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8
Change-Id: I033d29718d08803f375759faf83e2058df6d4906
Dirk Dougherty [Mon, 8 Oct 2012 18:41:44 +0000 (11:41 -0700)]
Doc change: edits to TV tablet story.
Change-Id: Idbada9a3b83f7e80cd7cf7b79da5c2f9ab4398d6
Dirk Dougherty [Sat, 6 Oct 2012 02:06:06 +0000 (19:06 -0700)]
am
daf69014: am
a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
* commit '
daf69014b5f25accae38dfef3d5880b4b7b87f8b':
Doc change: Add core quality and tablet quality docs and spotlight.
Dirk Dougherty [Sat, 6 Oct 2012 02:03:51 +0000 (19:03 -0700)]
am
a4c7176d: Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
* commit '
a4c7176dbc5193085ba3f2f602d16adac12cfa63':
Doc change: Add core quality and tablet quality docs and spotlight.
Dirk Dougherty [Sat, 6 Oct 2012 01:56:23 +0000 (18:56 -0700)]
Merge "Doc change: Add core quality and tablet quality docs and spotlight." into jb-dev-docs
Dirk Dougherty [Sat, 6 Oct 2012 01:54:45 +0000 (18:54 -0700)]
am
34765caf: am
d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
* commit '
34765caf6543bce8a4669563eb21f0077d4e2d26':
Doc change: edits to distribute content.
Dirk Dougherty [Sat, 6 Oct 2012 01:52:13 +0000 (18:52 -0700)]
am
d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs
* commit '
d8a4a72ab5f99d2dc5e95a07d9e3eb6ada40da6b':
Doc change: edits to distribute content.
Dirk Dougherty [Sat, 6 Oct 2012 01:50:02 +0000 (18:50 -0700)]
Merge "Doc change: edits to distribute content." into jb-dev-docs
Dirk Dougherty [Mon, 20 Aug 2012 18:07:36 +0000 (11:07 -0700)]
Doc change: Add core quality and tablet quality docs and spotlight.
Change-Id: Ia88e66818200fdc20417c0fe20672a5758284028
Conflicts:
docs/html/distribute/googleplay/quality/core.jd
docs/html/distribute/googleplay/quality/index.jd
docs/html/distribute/googleplay/quality/tablet.jd
Scott Main [Sat, 6 Oct 2012 00:05:55 +0000 (17:05 -0700)]
am
98d4d719: am
2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)
* commit '
98d4d7196870205d5d93df330bdef0c23fcaf2c0':
a few more crosslinks for design guide (to other design docs or dev docs)
Scott Main [Sat, 6 Oct 2012 00:03:33 +0000 (17:03 -0700)]
am
2ed01adc: a few more crosslinks for design guide (to other design docs or dev docs)
* commit '
2ed01adc8d1af5a11520bd71450b764ca36fcb1c':
a few more crosslinks for design guide (to other design docs or dev docs)
Scott Main [Thu, 4 Oct 2012 18:14:01 +0000 (11:14 -0700)]
a few more crosslinks for design guide (to other design docs or dev docs)
Change-Id: Icba63102236b6efe445957f1f3070b705a40e1a9
Joe Fernandez [Thu, 4 Oct 2012 20:08:27 +0000 (13:08 -0700)]
am
ab1456ab: am
e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
* commit '
ab1456abad6094e527ab318294c20ec58453e4af':
docs: Remove Android Open Accessory docs, which are now on source.android.com
Joe Fernandez [Thu, 4 Oct 2012 20:07:15 +0000 (13:07 -0700)]
am
e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
* commit '
e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127':
docs: Remove Android Open Accessory docs, which are now on source.android.com
Joe Fernandez [Thu, 4 Oct 2012 20:05:12 +0000 (13:05 -0700)]
Merge "docs: Remove Android Open Accessory docs, which are now on source.android.com" into jb-dev-docs
Scott Main [Thu, 4 Oct 2012 19:47:59 +0000 (12:47 -0700)]
am
c465ae32: am
688447e5: fix the lesson title names
* commit '
c465ae324521fa1cb6e130f297fbb6da72a5072e':
fix the lesson title names
Scott Main [Thu, 4 Oct 2012 19:45:29 +0000 (12:45 -0700)]
am
688447e5: fix the lesson title names
* commit '
688447e512185dab4acd9ddfc9f22066d164ff4e':
fix the lesson title names
Scott Main [Thu, 4 Oct 2012 19:43:05 +0000 (12:43 -0700)]
fix the lesson title names
Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
Scott Main [Thu, 4 Oct 2012 18:50:18 +0000 (11:50 -0700)]
am
bc7a20a4: resolved conflicts for merge of
78866b71 to jb-dev
* commit '
bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a':
Doc update: TTL change.
Joe Fernandez [Thu, 4 Oct 2012 18:43:09 +0000 (11:43 -0700)]
docs: Remove Android Open Accessory docs, which are now on source.android.com
Change-Id: I5346de7e575304523d33a94329792fb1a37db89b
Scott Main [Thu, 4 Oct 2012 18:39:00 +0000 (11:39 -0700)]
resolved conflicts for merge of
78866b71 to jb-dev
Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d
Scott Main [Thu, 4 Oct 2012 17:20:12 +0000 (10:20 -0700)]
Merge "Doc update: TTL change." into jb-dev-docs
Scott Main [Thu, 4 Oct 2012 17:10:21 +0000 (10:10 -0700)]
am
6b962174: am
cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
* commit '
6b962174bf974edd5298a37498777780e0b7b1fe':
add links from various design docs to corresponding developer docs
Scott Main [Thu, 4 Oct 2012 17:08:00 +0000 (10:08 -0700)]
am
cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
* commit '
cea1f19cb85c8204cc920bb1073c0726b610cedd':
add links from various design docs to corresponding developer docs
Scott Main [Thu, 4 Oct 2012 17:06:02 +0000 (10:06 -0700)]
Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs
Dirk Dougherty [Thu, 4 Oct 2012 00:43:04 +0000 (17:43 -0700)]
Doc change: edits to distribute content.
Change-Id: Ief68326428be5fc94060daca664b062e0af1f9df
Scott Main [Thu, 4 Oct 2012 01:47:08 +0000 (18:47 -0700)]
add links from various design docs to corresponding developer docs
Change-Id: Id731979a9b6ebcfc956848933d64ea5cf64953b5
Dirk Dougherty [Thu, 4 Oct 2012 02:40:35 +0000 (19:40 -0700)]
am
5713b5bc: am
99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
* commit '
5713b5bc929962e8ddc559f3f3e73a925a0c3150':
Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
Dirk Dougherty [Thu, 4 Oct 2012 02:38:17 +0000 (19:38 -0700)]
am
99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
* commit '
99f5ff0abb361de352f374822d2edc1a9379ad0c':
Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
Dirk Dougherty [Thu, 4 Oct 2012 02:37:00 +0000 (19:37 -0700)]
Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs
Dirk Dougherty [Thu, 4 Oct 2012 02:36:08 +0000 (19:36 -0700)]
Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
This reverts commit
c395f4a39cef3e0c2eaac8318b5e1723eac7d696
Change-Id: If74bdf2e567f60fc1af9e2c272531ef58e2cee41
Scott Main [Thu, 4 Oct 2012 00:28:53 +0000 (17:28 -0700)]
am
3a247b27: am
48b2cadf: fix badge generator button
* commit '
3a247b27284060ce16346091a8bb8bf36fc41b5a':
fix badge generator button
Scott Main [Thu, 4 Oct 2012 00:26:24 +0000 (17:26 -0700)]
am
48b2cadf: fix badge generator button
* commit '
48b2cadf1bc2c1c3400e567e1ea7c66be86e3ff5':
fix badge generator button
Scott Main [Thu, 4 Oct 2012 00:23:45 +0000 (17:23 -0700)]
fix badge generator button
Change-Id: I797da9baca30873db0c3600de67c41a0fba1b492
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
&& repo sync -j8 [Wed, 3 Oct 2012 22:38:34 +0000 (15:38 -0700)]
Doc update: TTL change.
Change-Id: I9ddb224e51140adc712b49442dc56cb78a8be901
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
OSDN Git Service
