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

120499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master 
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
 2013-12-02 12:37:58 -08:00
Glenn Kasten
866dbc9a73 Merge "Fix typo nbChannels -> channelMask" 2013-12-02 19:13:43 +00:00
Geoff Mendal
99e50023ab Merge "Import translations. DO NOT MERGE" 2013-12-02 19:13:26 +00:00
Geoff Mendal
83f3eca54b Import translations. DO NOT MERGE 
Change-Id: I87073de420071cb38050754b98f3c3e9db485f45
Auto-generated-cl: translation import
 2013-12-02 10:46:41 -08:00
Geoff Mendal
dca4e9ab8d Import translations. DO NOT MERGE 
Change-Id: I60f3f34d647bb11d8239a012b04cf8b6002467a0
Auto-generated-cl: translation import
 2013-12-02 10:15:07 -08:00
Jason Sams
afb02269cf Merge commit '1ccc6633' into manualmerge 
Conflicts:
	graphics/java/android/renderscript/Double2.java
	graphics/java/android/renderscript/Double3.java
	graphics/java/android/renderscript/Double4.java
	graphics/java/android/renderscript/Float2.java
	graphics/java/android/renderscript/Float3.java
	graphics/java/android/renderscript/Float4.java
	graphics/java/android/renderscript/Int2.java
	graphics/java/android/renderscript/Int3.java
	graphics/java/android/renderscript/Int4.java
	graphics/java/android/renderscript/Long2.java
	graphics/java/android/renderscript/Long3.java
	graphics/java/android/renderscript/Long4.java
	graphics/java/android/renderscript/Short2.java
	graphics/java/android/renderscript/Short3.java
	graphics/java/android/renderscript/Short4.java

Change-Id: Ib9e940bc7d62764020eea7639d7158af707eb33f
 2013-11-27 15:30:06 -08:00
Geoff Mendal
4f0be08f2b Merge "Import translations. DO NOT MERGE" 2013-11-27 20:16:38 +00:00
Katie McCormick
3a5b037422 am ad0cab26: am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit 'ad0cab26a7abb0b6d08e5a807bf8aff87db0a52a':
  Doc update: minor changes to immersive lesson
 2013-11-27 10:47:50 -08:00
Geoff Mendal
5229164040 Import translations. DO NOT MERGE 
Change-Id: Id51ce9cb79528df7df7d0473544792473514f454
Auto-generated-cl: translation import
 2013-11-27 10:45:55 -08:00
Geoff Mendal
88f03b330c Import translations. DO NOT MERGE 
Change-Id: Ia382ccfd20516ba157a6d9a0f4216c2af102190c
Auto-generated-cl: translation import
 2013-11-27 10:17:54 -08:00
Ying Wang
1622981ca4 Fix sdk build. 
Change-Id: I11471213826b212b99c0ddba89a7f4cef110fcc4
 2013-11-26 15:47:43 -08:00
Alan Viverette
26606007be Merge "Fix header and footer dividers to match docs" 2013-11-26 22:40:42 +00:00
Katie McCormick
37e4c405a6 am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '484b57a5655f28967e0062f578f38535dff52323':
  Doc updates: Javadoc fixes
 2013-11-26 14:00:33 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs 
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
 2013-11-26 21:58:18 +00:00
Katie McCormick
9d0a88bd4e Merge "Doc updates: Javadoc fixes" into klp-docs 2013-11-26 21:56:09 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes 
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
 2013-11-26 13:52:48 -08:00
Jason Sams
1ccc6633bf am 9e6d8f04: Merge "Adding operations to reflected Renderscript class" 
* commit '9e6d8f04940fd710ae858ff7ee4df43eb03ea85e':
  Adding operations to reflected Renderscript class
 2013-11-26 12:32:22 -08:00
Jason Sams
3042d2692f Generic object based data copy. 
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present.  This adds support for long/double and reduces
the amount of code present.  We could also support arrays of vectors
or objects in the future with this mechanism.


Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
 2013-11-26 12:29:46 -08:00
Jason Sams
9e6d8f0494 Merge "Adding operations to reflected Renderscript class" 2013-11-26 20:23:44 +00:00
Katie McCormick
ad0cab26a7 am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit 'fdb738a52fe0f0f3bef8b867c6646668d86835dd':
  Doc update: minor changes to immersive lesson
 2013-11-26 11:13:05 -08:00
Katie McCormick
fdb738a52f am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs 
* commit '752d8029176d3670b9e817d8465d854d4a1b933e':
  Doc update: minor changes to immersive lesson
 2013-11-26 19:09:52 +00:00
Katie McCormick
752d802917 Merge "Doc update: minor changes to immersive lesson" into klp-docs 2013-11-26 19:06:07 +00:00
Dan Sandler
baaabd5381 am 8e77393a: am 99ef026f: Merge "Keep PhoneStatusBar default constructor around." 
* commit '8e77393ae9b5ff99be06798311b3ec4362fbcb40':
  Keep PhoneStatusBar default constructor around.
 2013-11-26 08:48:37 -08:00
Lorenzo Colitti
5a7b1503b5 am c1c23780: am 9d4ac970: Merge "Pass DNS server info notifications to observers." 
* commit 'c1c23780339c35ab2d88c905d91e290050b35435':
  Pass DNS server info notifications to observers.
 2013-11-26 08:48:34 -08:00
Lorenzo Colitti
ab20cfd916 am 6747ea1b: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent." 
* commit '6747ea1b1cdf796710c01317da204f50d5721755':
  Minor cleanups to NetdCallbackReceiver.onEvent.
 2013-11-26 08:48:30 -08:00
Lorenzo Colitti
60bff9112d am aeefa69a: (-s ours) am 8a234809: Merge "Use BaseNetworkObserver in Tethering." 
* commit 'aeefa69a882eb1068da3a45cec82e50971c45df2':
  Use BaseNetworkObserver in Tethering.
 2013-11-26 08:48:27 -08:00
Dan Sandler
8e77393ae9 am 99ef026f: Merge "Keep PhoneStatusBar default constructor around." 
* commit '99ef026f48948f281467fcf4ce7ebbe15630ad45':
  Keep PhoneStatusBar default constructor around.
 2013-11-26 08:38:59 -08:00
Lorenzo Colitti
c1c2378033 am 9d4ac970: Merge "Pass DNS server info notifications to observers." 
* commit '9d4ac9703657142b190d3c256de7c3329e5a4b29':
  Pass DNS server info notifications to observers.
 2013-11-26 08:38:48 -08:00
Lorenzo Colitti
6747ea1b1c am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent." 
* commit 'eede7e89c94b3bb56c26aec137c53d592d3bc7c3':
  Minor cleanups to NetdCallbackReceiver.onEvent.
 2013-11-26 08:38:45 -08:00
Lorenzo Colitti
aeefa69a88 am 8a234809: Merge "Use BaseNetworkObserver in Tethering." 
* commit '8a234809e47106e445a4ddf2c70b9cd50d4c9348':
  Use BaseNetworkObserver in Tethering.
 2013-11-26 08:38:40 -08:00
Dan Sandler
99ef026f48 Merge "Keep PhoneStatusBar default constructor around." 2013-11-26 15:27:34 +00:00
John Spurlock
9105b7de47 Keep PhoneStatusBar default constructor around. 
By keeping the entire class safe.

Cherry picked because the device will otherwise be unusable
if compiled with proguard 4.10.

(cherry picked from commit af568530203dc2ee59f5fda4895d28b29dd92226)

Change-Id: I0b880f382101f737511bc6db96c604f43ed8d266
 2013-11-26 13:39:02 +00:00
Lorenzo Colitti
9d4ac97036 Merge "Pass DNS server info notifications to observers." 2013-11-26 01:03:06 +00:00
Lorenzo Colitti
eede7e89c9 Merge "Minor cleanups to NetdCallbackReceiver.onEvent." 2013-11-26 01:02:31 +00:00
Lorenzo Colitti
8a234809e4 Merge "Use BaseNetworkObserver in Tethering." 2013-11-26 01:02:14 +00:00
John Spurlock
27e72fc031 am 5cd1a87a: am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs 
* commit '5cd1a87a5c94e707f2cbe7d4751fdfeadd7ebbf0':
  Fix @see link in DocumentsContract docs.
 2013-11-25 15:39:55 -08:00
John Spurlock
5cd1a87a5c am e18b673a: am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs 
* commit 'e18b673a4dc8955dd0ecd53c57bb3f478614a92a':
  Fix @see link in DocumentsContract docs.
 2013-11-25 15:34:34 -08:00
John Spurlock
e18b673a4d am 330dfa7d: Merge "Fix @see link in DocumentsContract docs." into klp-docs 
* commit '330dfa7d11c542aa99aa277f75113bfc916d72dd':
  Fix @see link in DocumentsContract docs.
 2013-11-25 23:29:29 +00:00
John Spurlock
330dfa7d11 Merge "Fix @see link in DocumentsContract docs." into klp-docs 2013-11-25 23:25:36 +00:00
John Spurlock
4e55a7e8c5 Fix @see link in DocumentsContract docs. 
DocumentsContract#createDocument is hidden.

Change-Id: Iae9c4bcd8620c5297d1fc4e2324a8a242ab4b31a
 2013-11-25 18:00:07 -05:00
John Spurlock
cce137733b am e4f96e28: am 56979b22: am 125d133b: Fix bad @see links in Intent.java. 
* commit 'e4f96e281f85078d5420fdc52e00da3c6392ba1a':
  Fix bad @see links in Intent.java.
 2013-11-25 10:45:43 -08:00
Geoff Mendal
8122b192b1 am 926d0c41: (-s ours) am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE 
* commit '926d0c4138e09ef70a9e547be4e360962d839733':
  Import translations. DO NOT MERGE
 2013-11-25 10:45:40 -08:00
John Spurlock
e4f96e281f am 56979b22: am 125d133b: Fix bad @see links in Intent.java. 
* commit '56979b22346e186ebd804c4d7e05e0c74741f384':
  Fix bad @see links in Intent.java.
 2013-11-25 10:41:24 -08:00
Geoff Mendal
926d0c4138 am 3b6fa618: (-s ours) am 7a4adedf: (-s ours) Import translations. DO NOT MERGE 
* commit '3b6fa618ce8a1f14bb3949ce8c7be3417fb8568a':
  Import translations. DO NOT MERGE
 2013-11-25 10:41:21 -08:00
John Spurlock
56979b2234 am 125d133b: Fix bad @see links in Intent.java. 
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
  Fix bad @see links in Intent.java.
 2013-11-25 18:39:33 +00:00
Geoff Mendal
3b6fa618ce am 7a4adedf: (-s ours) Import translations. DO NOT MERGE 
* commit '7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
  Import translations. DO NOT MERGE
 2013-11-25 10:37:07 -08:00
Geoff Mendal
380604cf1f Merge "Import translations. DO NOT MERGE" 2013-11-25 18:35:11 +00:00
Geoff Mendal
1ef2de5b31 Import translations. DO NOT MERGE 
Change-Id: I3b3f9b9fa7fc41cac6e4978a23fd02b9ac67f3cb
Auto-generated-cl: translation import
 2013-11-25 10:06:37 -08:00
Geoff Mendal
7a4adedf0a Import translations. DO NOT MERGE 
Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
Auto-generated-cl: translation import
 2013-11-25 09:42:45 -08:00
Dmitry Shmidt
c12ac98b28 Merge "wifi: Remove obsolete libwpa_client library" 2013-11-25 17:40:06 +00:00