summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove FloatMath methods from the APINeil Fuller2015-05-076-71/+40
| | | | | | | | Also removing FloatMathTest. The tests are being moved into a legacy CTS suite. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
* Merge "Remove incomplete media router API." into mnc-devJeff Brown2015-05-075-412/+0
|\
| * Remove incomplete media router API.Jeff Brown2015-05-065-412/+0
| | | | | | | | | | | | | | | | This time not also accidentally deleting frameworks/base/Android.mk. *sigh* Bug: 20641986 Change-Id: I2e43ab1fdf4201fec4d5a5b73c04f27a4a848630
* | Merge "CEC: Make wakeup on hotplug optional" into mnc-devJinsuk Kim2015-05-072-1/+8
|\ \
| * | CEC: Make wakeup on hotplug optionalJinsuk Kim2015-05-072-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Added a new system property to make the feature optional. True by default. Bug: 20897914 Change-Id: I8bfca5144b802b95361e63b29abd6371971c7dbb
* | | am b53420d0: am e7866887: docs: M Preview landing pageJoe Fernandez2015-05-077-7/+85
|\ \ \ | | | | | | | | | | | | | | | | * commit 'b53420d02def4277cf5b8a04da289b4291a9f24a': docs: M Preview landing page
| * \ \ am e7866887: docs: M Preview landing pageJoe Fernandez2015-05-077-7/+85
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e78668876ed0dfc25fac604b5048509f72d92c53': docs: M Preview landing page
| | * | | docs: M Preview landing pageJoe Fernandez2015-05-067-7/+85
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
* | | | | Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" ↵Yohei Yukawa2015-05-077-15/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Retry "Always show auxiliary subtypes from NavBar keyboard icon."Seigo Nonaka2015-05-067-15/+70
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build breakage in 'layoutlib' target, with a proper fix. Hereafter the original CL description is repeated. The auxiliary subtypes should be listed if the input method picker is opened from NavBar keyboard icon. However there is only IMM#showInputMethodPicker() API to open input method picker and this is also used from LockScreen or Settings UI. Auxiliary subtypes should not be listed there(Id7cf5d122). Thus framework shows auxiliary subtypes based on IMMS#mInputShown and LockScreen state, but it is not a perfect solution. If a physical keyboard is connected, the soft input may be gone. As the result, auxiliary subtypes won't be listed even if it is opened from NavBar keyboard icon. To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean) to be able to decide showing auxiliary subtypes by caller. Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide. There is no public API change in this CL. Bug: 20763994 Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
* | | | | Bluetooth: Ensure Bluetooth interface handle is validNitin Arora2015-05-061-17/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds null checks to Bluetooth interface handle to prevent using null references when BluetoothService is not up. Also removed the callbacks for the intermediate state removed for now as they are not being used. Change-Id: I0e72ff4da467a8bcf5a4e5ac48d8558e7f308c7e
* | | | Merge "Revert "Remove incomplete media router API."" into mnc-devBart Sears2015-05-076-0/+1510
|\ \ \ \
| * | | | Revert "Remove incomplete media router API."Bart Sears2015-05-076-0/+1510
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL has broken all builds on mnc-dev. Reverting until Jeff can take a look at it. This reverts commit 2e5a2051de54e64612e1357d4534c7ec851aa508. Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
* | | | | am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to ↵Diego Perez2015-05-071-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | render a drawable in all available states" into lmp-mr1-dev * commit '0fe14486211e3ade7f29ea76e16211853fe9cd7a': Added function to render a drawable in all available states
| * | | | am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a ↵Diego Perez2015-05-072-6/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable in all available states" into lmp-mr1-dev * commit '2021c8773150dd47d8781375af94143cb22afd9d': Added function to render a drawable in all available states
| | * \ \ \ am 33e54563: am 4b125836: Merge "Added function to render a drawable in all ↵Diego Perez2015-05-072-6/+56
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available states" into lmp-mr1-dev * commit '33e54563daa0db610f9dc8b9d4fca8f826ffec73': Added function to render a drawable in all available states
| | | * \ \ \ am 4b125836: Merge "Added function to render a drawable in all available ↵Diego Perez2015-05-072-6/+56
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | states" into lmp-mr1-dev * commit '4b12583653561f69a5780126485380cac187c478': Added function to render a drawable in all available states
| | | | * \ \ \ Merge "Added function to render a drawable in all available states" into ↵Diego Perez2015-05-072-6/+56
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | | * | | | Added function to render a drawable in all available statesAndrew Shulaev2015-05-072-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730. Change-Id: I596855047d78c3c718744ad61432fc45e1239634 (cherry picked from commit 1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)
* | | | | | | | | Merge "Remove incomplete media router API." into mnc-devJeff Brown2015-05-076-1510/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Remove incomplete media router API.Jeff Brown2015-05-066-1510/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20641986 Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
* | | | | | | | | Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" ↵Bart Sears2015-05-076-68/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | Revert "Always show auxiliary subtypes from NavBar keyboard icon."Bart Sears2015-05-076-68/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL is breaking the build. Discussed with Seigo and verting until he can take a look at it. This reverts commit 80ff4ed6bb8dbdad7192d679a01096aa888e090b. Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
* | | | | | | | | | Merge changes from topic 'mr' into mnc-devJeff Brown2015-05-0728-4271/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. Revert "Initial draft of new MediaRouter APIs."
| * | | | | | | | | Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.Jeff Brown2015-05-062-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20641986 Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
| * | | | | | | | | Revert "Initial draft of new MediaRouter APIs."Jeff Brown2015-05-0627-4255/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f. Bug: 20641986 Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
* | | | | | | | | | am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes ↵Diego Perez2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I60c09f33,Ie0134c2b into lmp-mr1-dev * commit 'c2ba7391704cd4025c890b37148c16bf32b55a93': Add new parameter to the render method to allow forcing a measure pass. Avoid caching mImage on the main render loop and use clipping.
| * | | | | | | | | am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b ↵Diego Perez2015-05-073-7/+36
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '613aef87cf6a5958ff2fd255348f92f8d3de152e': Add new parameter to the render method to allow forcing a measure pass. Avoid caching mImage on the main render loop and use clipping.
| | * | | | | | | | am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86bff0bb63f3667f0b450420514c931b1f4d25d2': Add new parameter to the render method to allow forcing a measure pass. Avoid caching mImage on the main render loop and use clipping.
| | | * | | | | | | am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e20bd8e50724ab264425ba830cdf1beb96f7404': Add new parameter to the render method to allow forcing a measure pass. Avoid caching mImage on the main render loop and use clipping.
| | | | * | | | | | Merge changes I60c09f33,Ie0134c2b into lmp-mr1-devDiego Perez2015-05-073-7/+36
| | | | |\ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add new parameter to the render method to allow forcing a measure pass. Avoid caching mImage on the main render loop and use clipping.
| | | | | * | | | | Add new parameter to the render method to allow forcing a measure pass.Diego Perez2015-04-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60c09f3375fc85c257a449f4372220741e01db54 (cherry picked from commit c13aa0c035cd226d27323bc0e533632ba32f6a84)
| | | | | * | | | | Avoid caching mImage on the main render loop and use clipping.Diego Perez2015-04-222-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added a session flag that avoids caching mImage. This is useful when mImage is just a Graphics2D wrapper that might change at any time. + Make GcSnapshot aware of the clipping so it doesn't need to render the whole area if not needed. Change-Id: Ie0134c2bc2741b5fa6648313864c851bbac066cf (cherry picked from commit 2c5e85b303077d2120b428bd4c7e6ecb6970935b)
* | | | | | | | | | am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and ↵Diego Perez2015-05-073-2/+36
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigation bars widgets and usable from layouts" into lmp-mr1-dev * commit '9af506fb5b5f1c7f36fb439c2b120ad2b0cda602': Make status and navigation bars widgets and usable from layouts
| * | | | | | | | | am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation ↵Diego Perez2015-05-073-2/+36
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bars widgets and usable from layouts" into lmp-mr1-dev * commit '143eaa81934e47c8acb8338d1a2383eb79b690ef': Make status and navigation bars widgets and usable from layouts
| | * | | | | | | | am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and ↵Diego Perez2015-05-073-2/+36
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usable from layouts" into lmp-mr1-dev * commit '2ea82244f0b4396444ec891ab664f9ac40c0b55b': Make status and navigation bars widgets and usable from layouts
| | | * | | | | | | am 263e6dfa: Merge "Make status and navigation bars widgets and usable from ↵Diego Perez2015-05-073-2/+36
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layouts" into lmp-mr1-dev * commit '263e6dfa6aa3286b71ef908c8b2f06206e747ab1': Make status and navigation bars widgets and usable from layouts
| | | | * | | | | | Merge "Make status and navigation bars widgets and usable from layouts" into ↵Diego Perez2015-05-063-2/+36
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | | * | | | | | Make status and navigation bars widgets and usable from layoutsDiego Perez2015-04-213-2/+36
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow the theme editor to render these components separately. Change-Id: I8b2e0e78039b44623152e34f68ffcdfab5aa9885
* | | | | | | | | | am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to ↵Diego Perez2015-05-071-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use statusBarColor theme attribute" into lmp-mr1-dev * commit 'ae4619dd7f3d48cae2e9b83681849a77a8201142': Move StatusBar to use statusBarColor theme attribute
| * | | | | | | | | am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use ↵Diego Perez2015-05-071-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statusBarColor theme attribute" into lmp-mr1-dev * commit 'df4c977d760ccfcf929c77b100faa5f8f38df158': Move StatusBar to use statusBarColor theme attribute
| | * | | | | | | | am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme ↵Diego Perez2015-05-071-1/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute" into lmp-mr1-dev * commit '24e10c0bad54bdd3b37f6f7effea8f76b687ce3f': Move StatusBar to use statusBarColor theme attribute
| | | * | | | | | | am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" ↵Diego Perez2015-05-061-1/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '19dbe50bb534db6fa46f0df47f589a69212e9458': Move StatusBar to use statusBarColor theme attribute
| | | | * | | | | | Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-devDiego Perez2015-05-061-1/+2
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Move StatusBar to use statusBarColor theme attributeDiego Perez2015-04-301-1/+2
| | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0d8f4520a6dcb7225a2947cc56dc06a7340d3ba
* | | | | | | | | | am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders ↵Diego Perez2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use a color model compatible with the destination." into lmp-mr1-dev * commit '52ef7fce1626868d6be34f4038cd852259ad6a26': Make sure shaders use a color model compatible with the destination.
| * | | | | | | | | am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color ↵Diego Perez2015-05-074-8/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | model compatible with the destination." into lmp-mr1-dev * commit 'ffeb8117b139f61dd7c92bda6a7d47b83871cb66': Make sure shaders use a color model compatible with the destination.
| | * | | | | | | | am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model ↵Diego Perez2015-05-074-8/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible with the destination." into lmp-mr1-dev * commit '9c13c8de8291aac69958a106248d3229ff90609f': Make sure shaders use a color model compatible with the destination.
| | | * | | | | | | am bc47abe4: Merge "Make sure shaders use a color model compatible with the ↵Diego Perez2015-05-064-8/+19
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destination." into lmp-mr1-dev * commit 'bc47abe4b444d0386d1d939e4a223a976fade565': Make sure shaders use a color model compatible with the destination.
| | | | * | | | | | Merge "Make sure shaders use a color model compatible with the destination." ↵Diego Perez2015-05-064-8/+19
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
generated by cgit v1.1 at 2024-12-27 07:28:02 +0000