drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,862 Commits 1 Branch 0 Tags
Commit Graph

121862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +00:00
Deepanshu Gupta
dade24b491 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 2014-06-04 20:07:44 +00:00
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07:00
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Deepanshu Gupta
b1ca2a0c7f am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:34:15 +00:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
f52fcc7054 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 2014-06-04 19:31:31 +00:00
Andrew Solovay
c2086e09df am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '15ceb87a07d9ad1fba4265112492e34c5cc360f5':
  docs: Fixed error in code sample.
 2014-06-04 17:40:03 +00:00
Andrew Solovay
15ceb87a07 am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
  docs: Fixed error in code sample.
 2014-06-04 17:35:45 +00:00
Andrew Solovay
2e10cc9021 Merge "docs: Fixed error in code sample." into klp-docs 2014-06-04 17:32:46 +00:00
Ricardo Cervera
234474d565 am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '693a954626866e40b01264ff57fe6c336a7504a8':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:29:36 +00:00
Ricardo Cervera
693a954626 am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:24:35 +00:00
Ricardo Cervera
6e949d9ca5 Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 2014-06-04 17:21:39 +00:00
Robert Ly
f4f105f161 am dd57a6b2: am bb33ff04: update device dashboard for June 
* commit 'dd57a6b24d819bbfd9d2422f52dfb0fe9d43b3e9':
  update device dashboard for June
 2014-06-04 16:54:45 +00:00
Robert Ly
dd57a6b24d am bb33ff04: update device dashboard for June 
* commit 'bb33ff04b7d1f7f554331426bd9940edbbfd395d':
  update device dashboard for June
 2014-06-04 16:50:26 +00:00
Robert Ly
bb33ff04b7 update device dashboard for June 
Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765
 2014-06-04 09:27:18 -07:00
Katie McCormick
88d1c560ea am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit 'ea5fa98c7c381a37c113b7d2efdd6a406d902949':
  Doc update: new Volley class
 2014-06-04 12:32:09 +00:00
Katie McCormick
ea5fa98c7c am c659e746: Merge "Doc update: new Volley class" into klp-docs 
* commit 'c659e7465df342920f3906cbc0b024f610bf65bd':
  Doc update: new Volley class
 2014-06-04 12:26:44 +00:00
Katie McCormick
c659e7465d Merge "Doc update: new Volley class" into klp-docs 2014-06-04 12:01:39 +00:00
Dave Holmes
d965989067 Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation. 
https://b.corp.google.com/issue?id=14045807

Change-Id: I48e6a50f12c635cdf3dd597e4247d072bda14cc3
 2014-06-04 07:13:53 +00:00
David Friedman
689eb9e98e am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs 
* commit 'dba68be33efe4ee322a9ff3d895ed257162c0908':
  Fixed typos. "describe"-->"describes"; "allow"-->"allows"
 2014-06-04 03:09:34 +00:00
David Friedman
dba68be33e am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs 
* commit '00aae2793d37ed098a80bc0a98e8008b36178714':
  Fixed typos. "describe"-->"describes"; "allow"-->"allows"
 2014-06-04 03:05:26 +00:00
David Friedman
00aae2793d Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs 2014-06-04 03:01:52 +00:00
Andrew Solovay
9b8b1b6193 docs: Fixed error in code sample. 
The code sample didn't match the sample project. Also rewrote one
paragraph to clarify that you *create* a particular XML file (external
bug report said the file was missing from the sample project).

Also fixed formatting in a different line sample (overlong line
forced code box to scroll).

Doc is staged to:
http://asolovay.mtv:9098/training/contacts-provider/retrieve-names.html#NameMatch

bug: 15377898
Change-Id: I0898956255aa9174b12811e6f6ca826434b28c20
 2014-06-03 23:38:49 +00:00
Dirk Dougherty
e21d8d7b23 am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 
* commit '93a27e236b88636e68543d5edd80e5a5c176fb57':
  Adjust h3 margins for dynamic content blocks.
 2014-06-03 23:18:15 +00:00
Dirk Dougherty
93a27e236b am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 
* commit '7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
  Adjust h3 margins for dynamic content blocks.
 2014-06-03 23:13:50 +00:00
Dirk Dougherty
7f0c6478ae Merge "Adjust h3 margins for dynamic content blocks." into klp-docs 2014-06-03 23:09:37 +00:00
Craig Mautner
81dfc082d2 Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev 2014-06-03 22:41:38 +00:00
Deepanshu Gupta
2e78de7f37 am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '92641015c83ec027f0d06b8047804f5ffc2dc16b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:17:09 +00:00
Deepanshu Gupta
92641015c8 am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '5f664a1119f9008feeb924ec50c2ac896a8550db':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:10:10 +00:00
Deepanshu Gupta
5f664a1119 am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:06:02 +00:00
Deepanshu Gupta
2a57694d0a am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 21:02:55 +00:00
Deepanshu Gupta
e2edd753e8 am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '76364c6970f86bdf67622c14c9f1ebac6883998b':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:58:41 +00:00
Deepanshu Gupta
728e72df9d am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:54:31 +00:00
Deepanshu Gupta
46a156a6d0 am 7e49737d: am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '7e49737d80fa37731af44dff2f88a6054778f907':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:54:29 +00:00
Deepanshu Gupta
76364c6970 am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:53:49 +00:00
Deepanshu Gupta
d0f215756a am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:37 +00:00
Deepanshu Gupta
2bc3df2e3c am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:49:35 +00:00
Deepanshu Gupta
7e49737d80 am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'fb6e2f3b56fc067c634c122d605abe3841c309a9':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:49:32 +00:00
Deepanshu Gupta
b97ac2b6ac am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'c8414f11d7738dafc530178fd6dfa365d8b3d884':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:47:34 +00:00
Deepanshu Gupta
fb6e2f3b56 am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit '9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:47:30 +00:00
Deepanshu Gupta
c8414f11d7 am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:43:53 +00:00
Deepanshu Gupta
9bfbe93a7e am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] 
* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
  Remove @NonNull attribute [DO NOT MERGE]
 2014-06-03 20:43:50 +00:00
Deepanshu Gupta
3c1d72c2ef am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit 'ab869de19efc24265eebda19a97628713e072178':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:41:34 +00:00
Deepanshu Gupta
4dcb4a1f03 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] 
* commit '236b71649ce008578cf77557033df322e93a1e17':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]
 2014-06-03 20:39:10 +00:00