frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge ↵	Ricardo Cervera	2014-03-14	10	-39/+54
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	"docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs * commit 'd387206a84a35b86663adb5bf00671cafbf6aee4': docs: Updated Building your First App tutorial. Bug: 13429905
\| *	am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your ↵	Ricardo Cervera	2014-03-14	10	-39/+54
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First App tutorial. Bug: 13429905" into klp-docs * commit '882ba89bf4aa6046b8f69460f1fe3ad87325e6d8': docs: Updated Building your First App tutorial. Bug: 13429905
\| \| *	am 50694917: am 7e566239: Merge "docs: Updated Building your First App ↵	Ricardo Cervera	2014-03-14	10	-39/+54
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tutorial. Bug: 13429905" into klp-docs * commit '506949173761f9bde016b9d74de94df4b63df370': docs: Updated Building your First App tutorial. Bug: 13429905
\| \| \| *	Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into ↵	Ricardo Cervera	2014-03-13	10	-39/+54
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	klp-docs
\| \| \| \| *	docs: Updated Building your First App tutorial. Bug: 13429905	Ricardo Cervera	2014-03-13	10	-39/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Updated default code in activities from ADT -Updated screenshots for ADT wizards when changed -Updated activity_ with fragment_ where required -Other minor changes Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html Patch: Removed border from the new ADT screenshots. Patch: Replaced device screenshots using an Android 4.4 device. Patch: Addressed Katie's comments. Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
* \| \| \| \|	am 53edba8d: am 571c171e: am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc ↵	Joe Fernandez	2014-03-14	1	-5/+5
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change: Update developer video on home page carousel." into klp-docs * commit '53edba8d5cae3ea385f64ee980399278bb5a76fd': Doc change: Update developer video on home page carousel.
\| * \| \| \|	am 58f019a6: am 8bb11153: am f7267c8b: Merge "Doc change: Update developer ↵	Joe Fernandez	2014-03-14	1	-5/+5
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	video on home page carousel." into klp-docs * commit '58f019a646cb3eecdd3a085eade0824c89b1f80f': Doc change: Update developer video on home page carousel.
\| \| * \| \|	am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home ↵	Joe Fernandez	2014-03-14	1	-5/+5
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page carousel." into klp-docs * commit '8bb11153f946a95485644b08a067472735810ef2': Doc change: Update developer video on home page carousel.
\| \| \| * \|	Merge "Doc change: Update developer video on home page carousel." into klp-docs	Joe Fernandez	2014-03-13	1	-5/+5
\| \| \| \|\ \
\| \| \| \| * \|	Doc change: Update developer video on home page carousel.	Dirk Dougherty	2014-03-12	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic0cc5f38d8f8b161839585b46dbe3b3b1e1f4942
* \| \| \| \| \|	am 88f65e01: am 4108431b: am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in ↵	John Spurlock	2014-03-14	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	public logcat page. * commit '88f65e01d28c8f22d77624d1c8b264c761f3ac2a': Fix typo in public logcat page.
\| * \| \| \| \|	am 28ac0c10: am ad66c27b: am 6d9b034c: Fix typo in public logcat page.	John Spurlock	2014-03-14	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '28ac0c10ae58a8253db16406b63c37a2ddf94ccf': Fix typo in public logcat page.
\| \| * \| \| \|	am ad66c27b: am 6d9b034c: Fix typo in public logcat page.	John Spurlock	2014-03-14	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ad66c27b9c2f2dce1b9443018a7c4d097bc08fc3': Fix typo in public logcat page.
\| \| \| * \| \|	Fix typo in public logcat page.	John Spurlock	2014-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
* \| \| \| \| \|	am b063df4d: am c12c92bb: am 784aab78: am 8714a343: am ef6c9470: Merge ↵	Ricardo Cervera	2014-03-14	1	-0/+6
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"docs: Added step to get JDK to the Android Studio install instructions." into klp-docs * commit 'b063df4d27772aa9d71805acbb70b4473ad4b58d': docs: Added step to get JDK to the Android Studio install instructions.
\| * \| \| \| \|	am 784aab78: am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to ↵	Ricardo Cervera	2014-03-14	1	-0/+6
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the Android Studio install instructions." into klp-docs * commit '784aab786c9e6f84d6ae58655f32ce6b3ccfc33f': docs: Added step to get JDK to the Android Studio install instructions.
\| \| * \| \| \|	am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android ↵	Ricardo Cervera	2014-03-14	1	-0/+6
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Studio install instructions." into klp-docs * commit '8714a3437e13b4a403e49c4c624f272dd6dc8f4e': docs: Added step to get JDK to the Android Studio install instructions.
\| \| \| * \| \|	Merge "docs: Added step to get JDK to the Android Studio install ↵	Ricardo Cervera	2014-03-13	1	-0/+6
\| \| \| \|\ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \|	instructions." into klp-docs
\| \| \| \| * \|	docs: Added step to get JDK to the Android Studio install instructions.	Ricardo Cervera	2014-03-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 13353010 Stage: http://quixote.mtv:8002/sdk/installing/studio.html Patch: Addressed Scott's comments. Patch: Addressed Scott's comments. Change-Id: Iabbe0ddbcfab93e1c5fbbcb222c52bb47662850a
* \| \| \| \| \|	am e612874b: am 9c5c5a87: am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc ↵	Katie McCormick	2014-03-14	14	-1/+151
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update: new doc studio layout editor" into klp-docs * commit 'e612874b4c684f3d466d76a2e1a75fec066108f5': Doc update: new doc studio layout editor
\| * \| \| \| \|	am 8e142bbb: am b681794d: am 07c0ad97: Merge "Doc update: new doc studio ↵	Katie McCormick	2014-03-14	14	-1/+151
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	layout editor" into klp-docs * commit '8e142bbbe19c2f485033eace102d2e950ceeb4fb': Doc update: new doc studio layout editor
\| \| * \| \| \|	am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" ↵	Katie McCormick	2014-03-14	14	-1/+151
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into klp-docs * commit 'b681794d2583e06693c23eec1af4e282b067abd9': Doc update: new doc studio layout editor
\| \| \| * \| \|	Merge "Doc update: new doc studio layout editor" into klp-docs	Katie McCormick	2014-03-10	14	-1/+151
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| \| * \|	Doc update: new doc studio layout editor	Katie McCormick	2014-03-05	14	-1/+151
\| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iaeb99dca97086540e7d10f9de9e2978439ddebd9
* \| \| \| \|	am 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix ↵	Scott Main	2014-03-12	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some typos for GoogleApiClient doc" into klp-docs * commit '41b600304e6a2d007711ec814647e4dddbdd96ca': fix some typos for GoogleApiClient doc
\| * \| \| \|	am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for ↵	Scott Main	2014-03-11	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GoogleApiClient doc" into klp-docs * commit '212075889eab9aab2c48881803888a1b827d77ba': fix some typos for GoogleApiClient doc
\| \| * \| \|	am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" ↵	Scott Main	2014-03-11	1	-2/+2
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into klp-docs * commit '790c5a4c06e0ceee8fbdbed575e93ef257124569': fix some typos for GoogleApiClient doc
\| \| \| * \|	Merge "fix some typos for GoogleApiClient doc" into klp-docs	Scott Main	2014-03-10	1	-2/+2
\| \| \| \|\ \
\| \| \| \| * \|	fix some typos for GoogleApiClient doc	Scott Main	2014-02-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: If008a7c78b599a36abd1bfbe4907d5151ed91169
* \| \| \| \| \|	am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix ↵	Scott Main	2014-03-12	2	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	typos" into klp-docs * commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a': fix typos
\| * \| \| \| \|	am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs	Scott Main	2014-03-11	2	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2ada4e310d728756fc9bf69086987bfe215dc487': fix typos
\| \| * \| \| \|	am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs	Scott Main	2014-03-11	2	-2/+2
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd': fix typos
\| \| \| * \| \|	Merge "fix typos" into klp-docs	Scott Main	2014-03-10	2	-2/+2
\| \| \| \|\ \ \
\| \| \| \| * \| \|	fix typos	Scott Main	2014-02-26	2	-2/+2
\| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I28bcbf5ae5fade081d9b71701f5568145d700e9c
\| \| \| * \| \|	DO NOT MERGE	David Friedman	2014-03-04	1	-52/+288
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving change to release branch NDK r9d: Incorporates all review comments, final file sizes. Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750 (cherry picked from commit 0cdefe09695651e4a56dd980219710af8e1039a3)
* \| \| \| \| \|	am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK ↵	David Friedman	2014-03-04	1	-52/+288
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	r9d: Incorporates all review comments, final file sizes." into klp-ub-dev * commit '4c4160a041643072f0bcfbdcfbcc904796dd0a5c': NDK r9d: Incorporates all review comments, final file sizes.
\| * \| \| \| \|	am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all ↵	David Friedman	2014-03-04	1	-52/+288
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	review comments, final file sizes." into klp-ub-dev * commit '58d4906bbf9095c375bffa65d4249eba60cd49b4': NDK r9d: Incorporates all review comments, final file sizes.
\| \| * \| \| \|	am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file ↵	David Friedman	2014-03-04	1	-52/+288
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sizes." into klp-ub-dev * commit '6aa6219aebc2a73c63e2f0e5f82d3dc55f0a6f9f': NDK r9d: Incorporates all review comments, final file sizes.
\| \| \| * \ \ \	Merge "NDK r9d: Incorporates all review comments, final file sizes." into ↵	David Friedman	2014-03-04	1	-52/+288
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	klp-ub-dev
\| \| \| \| * \| \|	NDK r9d: Incorporates all review comments, final file sizes.	David Friedman	2014-03-03	1	-52/+288
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
* \| \| \| \| \| \|	am 4cd08e44: am 031020a7: am b8881542: am 1f8bd433: am 2970654a: am ↵	Scott Main	2014-03-04	1	-108/+109
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	0109047d: update google play badge AI files, v2. * commit '4cd08e4445afae142e656ccd5bc6d4fa9bbf816e': update google play badge AI files, v2.
\| * \| \| \| \| \|	am b8881542: am 1f8bd433: am 2970654a: am 0109047d: update google play badge ↵	Scott Main	2014-03-04	1	-108/+109
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AI files, v2. * commit 'b8881542c4e49c1d38eede36a018690a322c6b63': update google play badge AI files, v2.
\| \| * \| \| \| \|	am 2970654a: am 0109047d: update google play badge AI files, v2.	Scott Main	2014-03-04	1	-108/+109
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2970654a6ad2ebcfaabcb58d120b28987111602a': update google play badge AI files, v2.
\| \| \| * \| \| \|	update google play badge AI files, v2.	Scott Main	2014-03-03	1	-108/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7
* \| \| \| \| \| \|	am 653bd16a: am b6efa7a3: am 290fec2e: am b436b93d: am 318c73a0: am ↵	Scott Main	2014-03-04	1	-24/+24
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4a5a2392: Merge "dashboard update for march \'14" into klp-docs * commit '653bd16a0caad1e096ce981985f0617f49742a07': dashboard update for march '14
\| * \| \| \| \| \|	am 290fec2e: am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update ↵	Scott Main	2014-03-04	1	-24/+24
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for march \'14" into klp-docs * commit '290fec2e2e4a588d6b2fc48ec4aa25ebf83acf31': dashboard update for march '14
\| \| * \| \| \| \|	am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs	Scott Main	2014-03-04	1	-24/+24
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '318c73a0df694bb82821bfc4e2cd874bb09b2fab': dashboard update for march '14
\| \| \| * \| \| \|	Merge "dashboard update for march '14" into klp-docs	Scott Main	2014-03-04	1	-24/+24
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	dashboard update for march '14	Scott Main	2014-03-03	1	-24/+24
\| \| \| \| \| \|/ / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
* \| \| \| \| \| \|	am bd443abc: am 07993d1d: am 13a14ac4: am a61e74e1: am 7e4db882: am ↵	Ricardo Cervera	2014-03-04	5	-20/+177
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs * commit 'bd443abc0d6b90cff54c89454e19f86889455edd': docs: Changes to release notes for the Android SDK 22.6.0 release.