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

117482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Huang
299e011ebd am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 
* commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
 2013-11-13 12:07:10 -08:00
Baligh Uddin
9f500fe103 Import translations. DO NOT MERGE 
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
 2013-11-13 11:54:28 -08:00
Keiji Ariyama
1a8c7135f0 Fix NPE at PrintSpooler in Japanese environment. 
MediaSize ID have to be upper cases.

Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
 2013-11-13 11:43:26 -08:00
Christopher Tate
0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 2013-11-13 19:33:46 +00:00
Daniel Sandler
31f7c912f0 Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b Merge "DessertCase fixes:" into klp-dev 2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95 Merge "Switch DeadZone to Slog." into klp-dev 2013-11-13 19:32:24 +00:00
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
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
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
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
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
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
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
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
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
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
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
Scott Main
c468240c1a Revised some text while reading up on traceview. 
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f

Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
 2013-11-12 18:49:21 -08:00
Jim Miller
aa89847f4e Reduce camera launch time by about 250ms. 
This reduces the amount of time available to the user to cancel
launching the camera in order to improve average launch time.

It also increases the threshhold for flings and motions to prevent
unintentional launches which are costly in terms of falsing.

Fixes bug b/11657355

Change-Id: I852abbe3ce8ddddcb65f3a48a2f8111d20126189
 2013-11-12 18:14:26 -08:00
Raj Mamadgi
f89fade0cd Fix for the invalid Global Proxy Setting 
b/11598568

Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Change-Id: Ib93d24a80af1a329694f07c47bd81dfcc1e1b874
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
 2013-11-12 21:14:02 -05:00
Daniel Sandler
b65da9e720 Bespoke, handcrafted, artisanal assist affordance assets. 
Bug: 11243771
Change-Id: I6eb320ca78ccafc435259d30df95582aa7e3c53c
 2013-11-12 20:54:31 -05:00
Daniel Sandler
29787f6ed9 Switch DeadZone to Slog. 
Should help us identify stray clicks further back in time
thanks to the longer system log buffer.

Bug: 11273982
Change-Id: Ie2bf445622afff3dbc903adad6c0497954fa5fe0
 2013-11-12 20:33:34 -05:00
The Android Automerger
56dd9f0a10 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 17:24:36 -08:00