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

88977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today! 
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
 2013-01-23 15:14:31 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content 
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
 2013-01-23 14:23:06 -08:00
Amith Yamasani
596532d9db Properly initialize recognition service if the recognizer component changed. 
The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5
 2013-01-22 15:35:49 -08:00
Robert Ly
4efe071ed6 docs: update auth doc to mention multiple scopes bug 7644251 
Change-Id: I7f0c2e822c306161ae02b11439e5e0095463bcff
 2013-01-18 13:33:25 -08:00
Victoria Lease
0cf97d3217 Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev 2013-01-18 18:43:11 +00:00
Robert Ly
a239b933f7 am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 
* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class
 2013-01-18 10:23:29 -08:00
Robert Ly
548e17dfdb Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev 2013-01-18 18:20:40 +00:00
Roman Nurik
fb80c9e0f8 docs: Add PageTransformer to animations training class 
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
 2013-01-17 15:37:20 -08:00
Andy McFadden
ee3a1d5ece am 9b6687bb: Fix code snippet 
* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet
 2013-01-17 12:09:40 -08:00
Andy McFadden
9b6687bbc6 Fix code snippet 
One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f
 2013-01-17 11:24:02 -08:00
Victoria Lease
79d59f0968 DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. 
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
 2013-01-16 17:37:21 -08:00
Dirk Dougherty
4a0f95cffb am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 
* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.
 2013-01-16 16:37:03 -08:00
Dirk Dougherty
3987f6c179 Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev 2013-01-17 00:30:09 +00:00
Scott Kennedy
3332aa9852 am d7ec742c: docs: Minor typos 
* commit 'd7ec742c30be95da4d20930dd5000897bfe3f127':
  docs: Minor typos
 2013-01-16 10:08:08 -08:00
Dirk Dougherty
4166513f23 Doc change: Fix urls to work properly with https. 
Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd
 2013-01-15 19:57:25 -08:00
Scott Kennedy
d7ec742c30 docs: Minor typos 
One of these was mentioned in a comment in external 40435

Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
 2013-01-15 19:33:56 -08:00
Scott Main
ceddf9f8e8 am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 
* commit '3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
  docs: put new devbytes playlist on the develop landing
 2013-01-15 15:25:04 -08:00
Scott Main
3c3995f5ab Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev 2013-01-15 15:20:53 -08:00
Scott Kennedy
39ea055f9e am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit '335da367a167d11eefb9d8127b9423093213bcc8':
  docs: Another fix for external 42607
 2013-01-15 14:29:20 -08:00
Scott Kennedy
335da367a1 Merge "docs: Another fix for external 42607" into jb-mr1-dev 2013-01-15 14:24:24 -08:00
Scott Main
5b61ad2a9e docs: put new devbytes playlist on the develop landing 
Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288
 2013-01-15 11:18:48 -08:00
Scott Main
9ac31a78c8 am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples 
* commit 'ec171f3f48f49cffc49bf36d2d65a76489351034':
  docs: add download ZIPs for chet's devbyte samples
 2013-01-15 11:11:16 -08:00
Scott Main
ec171f3f48 docs: add download ZIPs for chet's devbyte samples 
Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f
 2013-01-15 11:03:49 -08:00
Xavier Ducrohet
dd52dfed52 am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev 
* commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34':
  Fix the single crunch command to return the right error code.
 2013-01-15 10:49:12 -08:00
Xavier Ducrohet
de3b69e051 Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev 2013-01-15 10:45:29 -08:00
Xavier Ducrohet
c75d3f5c10 Fix the single crunch command to return the right error code. 
Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
 2013-01-15 10:37:20 -08:00
Scott Kennedy
4aea83b1d1 docs: Another fix for external 42607 
Follow-up to If4215cef850ba8e4e8df356a68192566806e7914

Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b
 2013-01-15 08:52:37 -08:00
Dirk Dougherty
9af5cf2b38 am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '20d47ca81df71096fd74bc9205e0e2a744cb630a':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:24:16 -08:00
Dirk Dougherty
20d47ca81d Doc change: add developer video to carousel and spotlight pages. 
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
 2013-01-14 20:47:11 -08:00
Xia Wang
1279895720 am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev 
* commit 'd1a18011a68b2cac907d080d9044d527fd4c5853':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
 2013-01-14 15:00:38 -08:00
Xia Wang
d1a18011a6 Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev 2013-01-14 14:56:47 -08:00
Xia Wang
a178d672b7 Fix image processing test to include all benchmark tests 
-- each test case can be excuted separately
-- add a test case to run all benchmarks.

DO NOT MERGE

Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
 2013-01-14 11:19:16 -08:00
Scott Kennedy
026f91915f am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
  docs: Fix a bunch of issues
 2013-01-14 11:09:27 -08:00
Scott Kennedy
083426980d Merge "docs: Fix a bunch of issues" into jb-mr1-dev 2013-01-14 11:05:53 -08:00
Scott Main
1357617c78 am 07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems 
* commit '07ee7d17ac9e045bdbc08290df3275bbb4013e33':
  docs: Hide Arabic and Hebrew badges due to translation problems
 2013-01-14 10:25:38 -08:00
Scott Main
07ee7d17ac docs: Hide Arabic and Hebrew badges due to translation problems 
Change-Id: I0257b19bb08348bef5ddb500f00a165255e473f8
 2013-01-14 10:16:59 -08:00
Adam Koch
1a551b1614 am 6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation 
* commit '6f680f524a66dabcf0d86d0f19f3855f8c5e594f':
  Displaying Bitmaps Efficiently Training - Change memory calculation
 2013-01-14 06:15:20 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Adam Koch
6f680f524a Displaying Bitmaps Efficiently Training - Change memory calculation 
When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.

Bug: 7988323
Change-Id: Iaa9681a11aad5cad3857dfe76f0b8e4811b2243c
 2013-01-11 16:53:37 -05:00
Satoshi Kataoka
5327322ab9 Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev 2013-01-10 18:12:44 -08:00
Sascha Prueter
b5e4835e3a Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev 2013-01-10 11:11:20 -08:00
Jeff Brown
3b971598ed Improve heuristics for detecting wireless chargers. 
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.

The previous heuristics only considered the battery level to
suppress spurious dock signals.

The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.

Bug: 7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
 2013-01-10 10:01:56 -08:00
Adam Koch
ec7ffa1455 am 0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection 
* commit '0bb4dade30d3413cc7951c5d2c0ee761a93ae468':
  Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
 2013-01-10 06:26:46 -08:00
Satoshi Kataoka
9d08143fa7 Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled" 
This reverts commit 32b812054cce27d1c70b53ba8ac729c7186b105e

Bug: 7976890

Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
 2013-01-10 17:42:56 +09:00
Dianne Hackborn
e62fa82579 Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog 
The volume panel now forces us out of the UI modes while it
is up.

Change-Id: If39fa33b1c52579bf5d376ce4722408cee3ca951
 2013-01-09 18:51:51 -08:00
Adam Koch
0bb4dade30 Displaying Bitmaps Efficiently Training - Fix inSampleSize selection 
When computing inSampleSize, calculateInSampleSize() needs to compare
height/width ratios, rather than raw values.

Bug: 7951398
Change-Id: I207f9abc2aae4cc569b406bac237e221d8e64d1e
 2013-01-09 16:58:59 -05:00
Adam Powell
d29f2d263a Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev 2013-01-09 11:19:22 -08:00
Scott Main
25505f959c am cdf5106a: docs: a few doc bugs 
* commit 'cdf5106aafb77d17584d5401b207cbcc7a20f5f3':
  docs: a few doc bugs
 2013-01-08 20:13:40 -08:00