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

120490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
74d2480845 Move moveable non-public framework resources up to SystemUI 
Specifically, non-public resources only referenced by SystemUI
and nowhere else in frameworks or system apps (via @*android:)

Remove orphan resources found during the process.

Change-Id: I005514ff1ce52e1622849bc01cd825b09fa55842
 2013-12-02 17:37:40 -05: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
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
John Spurlock
125d133bcc Fix bad @see links in Intent.java. 
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
 2013-11-25 11:58:37 -05:00
Lorenzo Colitti
5ae4a531cc Pass DNS server info notifications to observers. 
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

[Cherry-pick of 416740ad4d9132005a71dc0883334e852235a18a]

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
 2013-11-25 17:27:17 +09:00
Lorenzo Colitti
a9626c1c95 Minor cleanups to NetdCallbackReceiver.onEvent. 
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.

[Cherry-pick of 59be800e7fe81842aa8c77b91319f58ab165983d]

Bug: 9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228
 2013-11-25 17:25:45 +09:00
Lorenzo Colitti
132fe8d27d Use BaseNetworkObserver in Tethering. 
Tethering currently inherits from the AIDL interface
INetworkManagementEventObserver, so it has to provide no-op
implementations of all the interface's methods. Inherit from
BaseNetworkObserver and get rid of the no-ops.

[Cherry-pick of f4e90eac87bc31611ddd80c46fc924d35ce66c1c]

Bug: 9180552
Change-Id: I74859b0d77951005651aaaa418185857e40eeedb
 2013-11-25 17:24:30 +09:00
Dirk Dougherty
2fbe13dc63 am 713e3853: am 0b492138: am 6000f1ed: Re-enable samples browser. 
* commit '713e3853bf57410f389496c20db1fc3818b3d5d8':
  Re-enable samples browser.
 2013-11-23 12:34:06 -08:00
Dirk Dougherty
713e3853bf am 0b492138: am 6000f1ed: Re-enable samples browser. 
* commit '0b492138c744299e695b6aeee24eebb880de1c7d':
  Re-enable samples browser.
 2013-11-23 12:31:18 -08:00
Dirk Dougherty
0b492138c7 am 6000f1ed: Re-enable samples browser. 
* commit '6000f1ed3d402e3136df173d987c901cc3cc1ff2':
  Re-enable samples browser.
 2013-11-23 20:28:04 +00:00
The Android Open Source Project
9318944dd1 am 57c33d0d: am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD 
* commit '57c33d0d71251d408cf771e5fa861fb1cdecf5f9':
 2013-11-22 19:31:23 -08:00