frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| \| * \| \|	Doc change: Add core quality and tablet quality docs and spotlight.	Dirk Dougherty	2012-10-05	13	-143/+566
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \|	am 07afab6b: am 34765caf: am d8a4a72a: Merge "Doc change: edits to ↵	Dirk Dougherty	2012-10-05	4	-1/+1384
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	distribute content." into jb-dev-docs * commit '07afab6bd4ef390f97096f14a2bb3d5852836b4c': Doc change: edits to distribute content.
\| * \| \| \| \| \|	am 34765caf: am d8a4a72a: Merge "Doc change: edits to distribute content." ↵	Dirk Dougherty	2012-10-05	4	-1/+1384
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into jb-dev-docs * commit '34765caf6543bce8a4669563eb21f0077d4e2d26': Doc change: edits to distribute content.
\| \| * \| \| \| \|	am d8a4a72a: Merge "Doc change: edits to distribute content." into jb-dev-docs	Dirk Dougherty	2012-10-05	4	-1/+1384
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd8a4a72ab5f99d2dc5e95a07d9e3eb6ada40da6b': Doc change: edits to distribute content.
\| \| \| * \| \| \|	Merge "Doc change: edits to distribute content." into jb-dev-docs	Dirk Dougherty	2012-10-05	4	-1/+1384
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	Doc change: edits to distribute content.	Dirk Dougherty	2012-10-04	4	-1/+1384
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ief68326428be5fc94060daca664b062e0af1f9df
* \| \| \| \| \| \|	am 1c2056d6: am 98d4d719: am 2ed01adc: a few more crosslinks for design ↵	Scott Main	2012-10-05	4	-3/+47
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	guide (to other design docs or dev docs) * commit '1c2056d6a5578f8c878535a3fb79a385ed1639d9': a few more crosslinks for design guide (to other design docs or dev docs)
\| * \| \| \| \| \|	am 98d4d719: am 2ed01adc: a few more crosslinks for design guide (to other ↵	Scott Main	2012-10-05	4	-3/+47
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	design docs or dev docs) * commit '98d4d7196870205d5d93df330bdef0c23fcaf2c0': a few more crosslinks for design guide (to other design docs or dev docs)
\| \| * \| \| \| \|	am 2ed01adc: a few more crosslinks for design guide (to other design docs or ↵	Scott Main	2012-10-05	4	-3/+47
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dev docs) * commit '2ed01adc8d1af5a11520bd71450b764ca36fcb1c': a few more crosslinks for design guide (to other design docs or dev docs)
\| \| \| * \| \| \|	a few more crosslinks for design guide (to other design docs or dev docs)	Scott Main	2012-10-04	4	-3/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Icba63102236b6efe445957f1f3070b705a40e1a9
* \| \| \| \| \| \|	am 7645936c: am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open ↵	Joe Fernandez	2012-10-04	5	-441/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accessory docs, which are now on source.android.com" into jb-dev-docs * commit '7645936c7b223ad865abdf22b79bdfac4cf39d98': docs: Remove Android Open Accessory docs, which are now on source.android.com
\| * \| \| \| \| \|	am ab1456ab: am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, ↵	Joe Fernandez	2012-10-04	5	-441/+18
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \|	am e3eeeb6d: Merge "docs: Remove Android Open Accessory docs, which are now ↵	Joe Fernandez	2012-10-04	5	-441/+18
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on source.android.com" into jb-dev-docs * commit 'e3eeeb6d03ed8575df5e8c8dfecd4e26af2d4127': docs: Remove Android Open Accessory docs, which are now on source.android.com
\| \| \| * \| \| \|	Merge "docs: Remove Android Open Accessory docs, which are now on ↵	Joe Fernandez	2012-10-04	5	-441/+18
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	source.android.com" into jb-dev-docs
\| \| \| \| * \| \| \|	docs: Remove Android Open Accessory docs, which are now on source.android.com	Joe Fernandez	2012-10-04	5	-441/+18
\| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I5346de7e575304523d33a94329792fb1a37db89b
* \| \| \| \| \| \|	am a35333c1: am c465ae32: am 688447e5: fix the lesson title names	Scott Main	2012-10-04	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a35333c1719b312dd7c0d0a8591ee522f6f625e7': fix the lesson title names
\| * \| \| \| \| \|	am c465ae32: am 688447e5: fix the lesson title names	Scott Main	2012-10-04	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c465ae324521fa1cb6e130f297fbb6da72a5072e': fix the lesson title names
\| \| * \| \| \| \|	am 688447e5: fix the lesson title names	Scott Main	2012-10-04	1	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '688447e512185dab4acd9ddfc9f22066d164ff4e': fix the lesson title names
\| \| \| * \| \| \|	fix the lesson title names	Scott Main	2012-10-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
\| \| \| * \| \| \|	Merge "Doc update: TTL change." into jb-dev-docs	Scott Main	2012-10-04	2	-3/+3
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Doc update: TTL change.	&& repo sync -j8	2012-10-03	2	-3/+3
\| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I9ddb224e51140adc712b49442dc56cb78a8be901
* \| \| \| \| \| \|	am 70e6cff9: am 6b962174: am cea1f19c: Merge "add links from various design ↵	Scott Main	2012-10-04	15	-2/+139
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs to corresponding developer docs" into jb-dev-docs * commit '70e6cff9bcd464fcb22a0d7dc977863ef0952448': add links from various design docs to corresponding developer docs
\| * \| \| \| \| \|	am 6b962174: am cea1f19c: Merge "add links from various design docs to ↵	Scott Main	2012-10-04	15	-2/+139
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	corresponding developer docs" into jb-dev-docs * commit '6b962174bf974edd5298a37498777780e0b7b1fe': add links from various design docs to corresponding developer docs
\| \| * \| \| \| \|	am cea1f19c: Merge "add links from various design docs to corresponding ↵	Scott Main	2012-10-04	15	-2/+139
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	developer docs" into jb-dev-docs * commit 'cea1f19cb85c8204cc920bb1073c0726b610cedd': add links from various design docs to corresponding developer docs
\| \| \| * \| \| \|	Merge "add links from various design docs to corresponding developer docs" ↵	Scott Main	2012-10-04	15	-2/+139
\| \| \| \|\ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	into jb-dev-docs
\| \| \| \| * \| \|	add links from various design docs to corresponding developer docs	Scott Main	2012-10-03	15	-2/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Id731979a9b6ebcfc956848933d64ea5cf64953b5
* \| \| \| \| \| \|	am 486eb461: am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core ↵	Dirk Dougherty	2012-10-03	14	-1827/+53
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quality and tablet quality docs, tablet developer stories."" into jb-dev-docs * commit '486eb4616e07d23a408a475adaf450b1bc2f9024': Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
\| * \| \| \| \| \|	am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and ↵	Dirk Dougherty	2012-10-03	14	-1827/+53
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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."
\| \| * \| \| \| \|	am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality ↵	Dirk Dougherty	2012-10-03	14	-1827/+53
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs, tablet developer stories."" into jb-dev-docs * commit '99f5ff0abb361de352f374822d2edc1a9379ad0c': Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
\| \| \| * \| \| \|	Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet ↵	Dirk Dougherty	2012-10-03	14	-1827/+53
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	developer stories."" into jb-dev-docs
\| \| \| \| * \| \|	Revert "Doc change: Add core quality and tablet quality docs, tablet ↵	Dirk Dougherty	2012-10-03	14	-1827/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	developer stories." This reverts commit c395f4a39cef3e0c2eaac8318b5e1723eac7d696 Change-Id: If74bdf2e567f60fc1af9e2c272531ef58e2cee41
* \| \| \| \| \| \|	am c1f68fdd: am 3a247b27: am 48b2cadf: fix badge generator button	Scott Main	2012-10-03	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c1f68fdde0880270d0b865ad6a728d65355dbb44': fix badge generator button
\| * \| \| \| \| \|	am 3a247b27: am 48b2cadf: fix badge generator button	Scott Main	2012-10-03	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3a247b27284060ce16346091a8bb8bf36fc41b5a': fix badge generator button
\| \| * \| \| \| \|	am 48b2cadf: fix badge generator button	Scott Main	2012-10-03	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '48b2cadf1bc2c1c3400e567e1ea7c66be86e3ff5': fix badge generator button
\| \| \| * \| \| \|	fix badge generator button	Scott Main	2012-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I797da9baca30873db0c3600de67c41a0fba1b492
* \| \| \| \| \| \|	am 663db551: am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev	Scott Main	2012-10-03	7	-16/+38
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '663db551ce9e9f86693315cbc995e2215d1cf2e5': add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
\| * \| \| \| \| \|	am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev	Scott Main	2012-10-03	7	-16/+38
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '4d62456e211a0b4cd77a8967417340612994cb6c': add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.
\| \| * \| \| \| \|	resolved conflicts for merge of f15f8a1b to jb-dev	Scott Main	2012-10-03	7	-16/+38
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa
\| \| \| * \| \| \|	Merge "add analytics event tracking for Design downloads, SDK downloads, ↵	Scott Main	2012-10-03	7	-16/+38
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Badges and Device art." into jb-dev-docs
\| \| \| \| * \| \| \|	add analytics event tracking for Design downloads, SDK downloads, Badges and ↵	Scott Main	2012-10-03	7	-16/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Device art. Change-Id: I479b0059678d31fb993f6ddc68f5a7ef5ee26ecc
* \| \| \| \| \| \| \|	am 2af82879: am 25a9144b: Merge "docs: Update design download links" into jb-dev	Scott Main	2012-10-03	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2af828790b261fdf9a57fa80fb6ea6415fef88ee': docs: Update design download links
\| * \| \| \| \| \| \|	am 25a9144b: Merge "docs: Update design download links" into jb-dev	Scott Main	2012-10-03	2	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc': docs: Update design download links
\| \| * \| \| \| \| \|	Merge "docs: Update design download links" into jb-dev	Scott Main	2012-10-03	2	-2/+2
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	docs: Update design download links	Roman Nurik	2012-10-03	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a manual merge of change I354d5dfd9c8c8843c217767ccb04447b30f79a48 from jb-dev-docs. Change-Id: I448eca9e6c5a3e4ff9af82e14d713fdf3e99f236
* \| \| \| \| \| \| \| \|	am d4c18b01: am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to ↵	Scott Main	2012-10-03	13	-554/+680
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	focus on using DialogFragment" into jb-dev-docs * commit 'd4c18b01cc152f97ea30146d0ad795c05b59e178': re-write the Dialog guide to focus on using DialogFragment
\| * \| \| \| \| \| \| \|	am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using ↵	Scott Main	2012-10-03	13	-554/+680
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DialogFragment" into jb-dev-docs * commit 'b31d0b3b6d0506970adeecd9177e276dd407f418': re-write the Dialog guide to focus on using DialogFragment
\| \| * \| \| \| \| \| \|	am d2e9486b: Merge "re-write the Dialog guide to focus on using ↵	Scott Main	2012-10-03	13	-554/+680
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| / / / / / \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DialogFragment" into jb-dev-docs * commit 'd2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc': re-write the Dialog guide to focus on using DialogFragment
\| \| \| * \| \| \| \|	Merge "re-write the Dialog guide to focus on using DialogFragment" into ↵	Scott Main	2012-10-03	13	-554/+680
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	jb-dev-docs
\| \| \| \| * \| \| \|	re-write the Dialog guide to focus on using DialogFragment	Scott Main	2012-09-28	13	-554/+680
\| \| \| \| \| \|/ / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ia7812f4dab5d6c3d2f945da009891239b9d8d5e3
\| \| \| * \| \| \|	docs: Update design download links	Roman Nurik	2012-10-03	3	-3/+3
\| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I354d5dfd9c8c8843c217767ccb04447b30f79a48