summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Update LayoutLib for theme key changes to fix buildAlan Viverette2015-05-071-14/+9
| | | | Change-Id: I47b400b320f16688cd32c1d8955a660637d93f4d
* Retry "Always show auxiliary subtypes from NavBar keyboard icon."Seigo Nonaka2015-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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
| | | * 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)
| * | | | 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.
| | | * | 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
| | | * | 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
| | | * | 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 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.
| | | * | Merge "Make sure shaders use a color model compatible with the destination." ↵Diego Perez2015-05-064-8/+19
| | | |\ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | | * | Make sure shaders use a color model compatible with the destination.Diego Perez2015-04-154-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf6e14bb86835c36a5b0c37519ac2ee794d10081 (cherry picked from commit 158ac454073a460375123d7d05152a7c6490efb6)
* | | | | | am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib ↵Deepanshu Gupta2015-05-0713-14/+467
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests." into lmp-mr1-dev * commit 'a131bfe094c007721d006fc9ca21cfa74f41dfef': More layoutlib tests.
| * | | | | am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into ↵Deepanshu Gupta2015-05-0713-14/+467
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '3dbd18cdfe6af1a9c36261551ef98d39e849d389': More layoutlib tests.
| | * | | | am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-devDeepanshu Gupta2015-05-0713-14/+467
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '872e9950a227128d323c24eb369863e16964493a': More layoutlib tests.
| | | * | | Merge "More layoutlib tests." into lmp-mr1-devDeepanshu Gupta2015-05-0613-14/+467
| | | |\ \ \
| | | | * | | More layoutlib tests.Deepanshu Gupta2015-04-1613-14/+467
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add another layout including more widgets and thus testing layoutlib better. - Update targetSdk Version to 22. - Handling of dynamic ids (@+id/) in LayoutLibTestCallback is buggy. Since this is not a problem in Studio, and this is not testing the callback, work around the issue by declaring the ids in values/ids.xml. Change-Id: I457c105e8556c4df13cd86da2250fe5fd37843a8
* | | | | | | resolved conflicts for merge of a663e012 to mnc-devDeepanshu Gupta2015-05-064-129/+50
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
| * | | | | | am 9abe4232: am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: ↵Deepanshu Gupta2015-05-076-168/+93
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better XML attrs." into lmp-mr1-dev * commit '9abe42324f2252460b003e6fcdb097910e16178a': RecyclerView in LayoutLib: better XML attrs.
| | * | | | | am 7e4c1a92: am b4ca896f: Merge "RecyclerView in LayoutLib: better XML ↵Deepanshu Gupta2015-05-076-168/+93
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attrs." into lmp-mr1-dev * commit '7e4c1a92b8f3ce02df0a1502be45c450308d81b7': RecyclerView in LayoutLib: better XML attrs.
| | | * | | | Merge "RecyclerView in LayoutLib: better XML attrs." into lmp-mr1-devDeepanshu Gupta2015-05-066-168/+93
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | RecyclerView in LayoutLib: better XML attrs.Deepanshu Gupta2015-04-166-168/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - RecyclerView now supports XML attributes natively. Thus, remove the custom support via tools attribute. Users with older versions of RecyclerView should update. - Add Context.getPackageName() support used by RecyclerView. - Update SessionParamsFlags with the new changes and rename it to RenderParamsFlags. The attribute behaves slightly different from the original tools attribute. For usage, see commit 044b5b61e96 in frameworks/support. Change-Id: I12073e37a2ba411558ca1d3e30c399e3d9a0b144
* | | | | | | am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix ↵Diego Perez2015-05-071-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev * commit '9efcb308615c0adaf418d430adabea3d271bcbb4': Fix isThemeAppCompat NPE when using an invalid theme
| * | | | | | am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when ↵Diego Perez2015-05-071-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using an invalid theme" into lmp-mr1-dev * commit '21246bd92f54be468496848b659bf47f2522430a': Fix isThemeAppCompat NPE when using an invalid theme
| | * | | | | am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an ↵Diego Perez2015-05-071-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid theme" into lmp-mr1-dev * commit '8e75e307373a03dcbc55ce71be5b50f80e0474db': Fix isThemeAppCompat NPE when using an invalid theme
| | | * | | | Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-devDiego Perez2015-05-061-3/+3
| | | |\ \ \ \
| | | | * | | | Fix isThemeAppCompat NPE when using an invalid themeDiego Perez2015-04-211-3/+3
| | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the theme does not longer exists on the Android Studio side, getDefaultTheme will return null causing isThemeAppCompat to crash. Change-Id: I5a5c17126dce72e9872522643219b9438666bc04
* | | | | | | am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity ↵Deepanshu Gupta2015-05-071-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | annotations to some tests." into lmp-mr1-dev * commit '9c9bcd3486d9f7557329dea90b3c5fa1bdace91c': Nullity annotations to some tests.
| * | | | | | am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some ↵Deepanshu Gupta2015-05-071-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests." into lmp-mr1-dev * commit 'cae76a70bfca9f37a10f34582cddbe0792625f26': Nullity annotations to some tests.
| | * | | | | am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into ↵Deepanshu Gupta2015-05-071-6/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '4624107185135db9db6bfbfb3d0c3a0951c19ee1': Nullity annotations to some tests.
| | | * | | | Merge "Nullity annotations to some tests." into lmp-mr1-devDeepanshu Gupta2015-05-061-6/+6
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Nullity annotations to some tests.Deepanshu Gupta2015-04-161-6/+6
| | | | |/ / | | | | | | | | | | | | | | | | | | Change-Id: I2939d7fab30f3b8fe32f2fdf720c630d677373ff
* | | | | | am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar ↵Deepanshu Gupta2015-05-071-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | showing when not required." into lmp-mr1-dev * commit 'b2951490eabf71e14c8fc5d50397adf869a2a291': Fix title bar showing when not required.
| * | | | | am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not ↵Deepanshu Gupta2015-05-071-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required." into lmp-mr1-dev * commit 'b19325be074e466c39e86fd4418726a7c305546c': Fix title bar showing when not required.
| | * | | | am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." ↵Deepanshu Gupta2015-05-071-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '2e3c41a4e4fbb811cdafc754708d62cba7c6c1b6': Fix title bar showing when not required.
| | | * | | Merge "Fix title bar showing when not required." into lmp-mr1-devDeepanshu Gupta2015-05-061-1/+1
| | | |\ \ \
generated by cgit v1.1 at 2025-01-07 05:10:29 +0000