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

120294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
54ca906604 Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 2013-11-13 19:14:00 +00:00
Robert Greenwalt
c07094c88d am 955b575d: am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" 
* commit '955b575dd94370f618f6b6424d60c1aa9dc34c14':
  Fix NPE in ConnectivityService
 2013-11-13 10:33:56 -08:00
Robert Greenwalt
955b575dd9 am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService" 
* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService
 2013-11-13 10:27:46 -08:00
Robert Greenwalt
6eddb39c85 am 18490abd: Merge "Fix NPE in ConnectivityService" 
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
 2013-11-13 10:25:30 -08:00
Raphael Moll
41bd1e555e am d24bf4ab: am c95bfc4d: am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs 
* commit 'd24bf4ab07693e910410cffb745e83bc572fd339':
  Android Studio download for 0.3.2
 2013-11-13 10:23:43 -08:00
Robert Greenwalt
18490abd9b Merge "Fix NPE in ConnectivityService" 2013-11-13 18:22:26 +00:00
Raphael Moll
d24bf4ab07 am c95bfc4d: am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs 
* commit 'c95bfc4dc8eb453999dedbb9a437713bd41eacb4':
  Android Studio download for 0.3.2
 2013-11-13 10:18:37 -08:00
Raphael Moll
c95bfc4dc8 am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs 
* commit '7b0d9a50b4f19dfd89a20b5fd004a014ae8ec02b':
  Android Studio download for 0.3.2
 2013-11-13 18:13:08 +00:00
Raphael Moll
7b0d9a50b4 Merge "Android Studio download for 0.3.2" into klp-docs 2013-11-13 18:09:20 +00:00
Glenn Kasten
34262cdfc5 Replace keyboard sounds with latest (softer) design 
Make AudioPackage8 (N7 v1) and AudioPackage9 (N10) more like
AudioPackage12_48 (N5).

Bug: 11158758
Change-Id: I55052218f62159fd90efb21be19e19509eb11afe
 2013-11-13 09:17:46 -08:00
Jeff Brown
7671231d41 am e5ae0bfd: am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev 
* commit 'e5ae0bfdf7933d7ea8bec94f0c7e25347c423710':
  Finalize assets for screen casting.
 2013-11-13 09:02:27 -08:00
Jeff Brown
e5ae0bfdf7 am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev 
* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.
 2013-11-13 08:58:53 -08:00
John Spurlock
0d784869c6 am e86ab5e1: am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 
* commit 'e86ab5e1d34beb6706589f0ce316c0cfa0053ee4':
  Ensure wallpaper hint is at least as large as the display.
 2013-11-13 08:54:40 -08:00
Jeff Brown
a20f625cc1 am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev 
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.
 2013-11-13 08:54:27 -08:00
Jeff Brown
41b92b008e Merge "Finalize assets for screen casting." into klp-dev 2013-11-13 16:51:53 +00:00
John Spurlock
e86ab5e1d3 am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 
* commit '79033da8e42ba6ccf096bf10dea1e51873f7d402':
  Ensure wallpaper hint is at least as large as the display.
 2013-11-13 08:50:07 -08:00
Deepanshu Gupta
4fc4f46ff7 am f7400aa1: (-s ours) am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
* commit 'f7400aa1da0b3604dbb5fc1bf4b4242a8e65e860':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
 2013-11-13 08:45:54 -08:00
John Spurlock
79033da8e4 am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 
* commit '7d667ee2de2c6add257466d9648024d7e8402926':
  Ensure wallpaper hint is at least as large as the display.
 2013-11-13 08:45:46 -08:00
Deepanshu Gupta
f7400aa1da am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
* commit '6870d29c340008919dcd9e547236b74301b3b9ef':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
 2013-11-13 08:43:34 -08:00
John Spurlock
7d667ee2de Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 2013-11-13 16:41:44 +00:00
Deepanshu Gupta
6870d29c34 am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
* commit '78cfdf31b7c48589ea3a148ec1d6d573235bc06b':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
 2013-11-13 08:40:08 -08:00
Deepanshu Gupta
1f92d7fc0f Add libphonenumber to layoutlib.jar. DO NOT MERGE 
Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
 2013-11-13 18:15:51 +05:30
Deepanshu Gupta
d0581d271e Fix NPE in layoutlib. DO NOT MERGE 
Change-Id: I36623304d83b344ea078044001577b8005a63c02
 2013-11-13 18:15:51 +05:30
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
 2013-11-13 18:15:51 +05:30
Jeff Brown
e7ae644522 Finalize assets for screen casting. 
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
 2013-11-13 02:17:53 -08:00
Jean Chalard
e1ce53209a am 9ea18d49: am d952ac4c: am 218ecd43: Fix the docs build 
* commit '9ea18d495c4c3d47d279f3f63cb4a24641544f89':
  Fix the docs build
 2013-11-12 22:35:28 -08:00
Jean Chalard
9ea18d495c am d952ac4c: am 218ecd43: Fix the docs build 
* commit 'd952ac4c171780da78a157de73702d60d4737916':
  Fix the docs build
 2013-11-12 22:31:34 -08:00
Jean Chalard
f86e81c4ff [DO NOT MERGE] Improve documentation for InputType and EditorInfo. 
Bug: 11245912
Change-Id: If00bb540f25b176da803af0e02fc1ce1b46537e1
 2013-11-13 15:29:16 +09:00
Jean Chalard
d952ac4c17 am 218ecd43: Fix the docs build 
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
 2013-11-12 22:27:47 -08:00
Jean Chalard
218ecd4394 Fix the docs build 
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
 2013-11-13 15:20:58 +09:00
Ken Mixter
151d3032eb Fix NPE in ConnectivityService 
Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1
 2013-11-12 22:17:46 -08:00
Jean Chalard
cfafb5059d am 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '4563728371520de38445d5758edd3da7538a1934':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:27:34 -08:00
Jean Chalard
4563728371 am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '383ef79d14a64b335d94353e87e824ea2f37ee65':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:25:26 -08:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev 
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
 2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
Dirk Dougherty
3eb6846efb am 9d90e73d: am 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 
* commit '9d90e73d09b01a4c95d06a27aa39c2d7c84afe50':
  Doc change: Update Play for Edu docs for full launch.
 2013-11-12 20:53:42 -08:00
Dirk Dougherty
9d90e73d09 am 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 
* commit '0deaa273bdf04396a82ace71d5fbefc2cb8404e6':
  Doc change: Update Play for Edu docs for full launch.
 2013-11-12 20:49:36 -08:00
Dirk Dougherty
0deaa273bd am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 
* commit 'ee8f2a647eb08ab39d6f622cef3cdad20d79463a':
  Doc change: Update Play for Edu docs for full launch.
 2013-11-13 04:45:12 +00:00
Dirk Dougherty
ee8f2a647e Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 2013-11-13 04:25:53 +00:00
Dirk Dougherty
4dfd8b48ff Doc change: Update Play for Edu docs for full launch. 
Change-Id: I50a1bfa6087383a5e7a10051e9a73ada96980297
 2013-11-12 20:07:07 -08:00
The Android Automerger
b9480186c9 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 20:00:43 -08:00
Jim Miller
c816b8eedb Enable fast camera transition when launched from navbar 
This reduces the camera transition timeout to 0 if launched
from the navigation bar.  The transition cannot be aborted once
launched.

Change-Id: I7c376fbb90fd51cd301ef49fbd3411370bc2e4b5
 2013-11-12 19:52:12 -08:00
Daniel Sandler
5c6a781eaf DessertCase fixes: 
- No more crashing on first launch of the easter egg
- Use IMMERSIVE_STICKY to avoid getting stuck with bars

Bug: 11319125
Change-Id: I4522feb36c29be8446715ba67d454a2012d181ca
 2013-11-12 22:32:03 -05:00
Scott Main
72cd81db36 am af623b99: am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'af623b99dafbc16effc7b05de833e842654b75e1':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 19:29:11 -08:00
Adam Powell
34ccdf2d94 am c991bf90: am 086370c9: am 2229ca03: Fix an action bar accessibility regression 
* commit 'c991bf90bbdd01b746d70f2f045d19cabe19d690':
  Fix an action bar accessibility regression
 2013-11-12 19:28:59 -08:00
Craig Mautner
b12eb71c4f Merge commit 'bf581034' into manualmerge 
Conflicts:
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
 2013-11-12 19:17:06 -08:00
Scott Main
af623b99da am bb146981: am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit 'bb1469816451aeb24eb8208fac1f2596f528aa80':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-12 18:58:13 -08:00
Igor Chernyshev
b94d654d36 Use index in SparseArray access properly 
The original code was calling get() rather than valueAt(),
treating index as if it was a key.

Change-Id: I52539dfcb49b3d2ee3cb027d38c50b46f73b5ee7
Signed-off-by: Igor Chernyshev <igorc@google.com>
 2013-11-12 18:56:21 -08:00
Scott Main
bb14698164 am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 
* commit '29610421a32501661d6c20136c76ec426d6500fb':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
 2013-11-13 02:53:40 +00:00
Scott Main
29610421a3 Merge "Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 2013-11-13 02:50:50 +00:00