summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget
Commit message (Expand)AuthorAgeFilesLines
* am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-devAlan Viverette2014-06-033-5/+4
|\
| * Clean up drawable theming APIsAlan Viverette2014-06-023-5/+4
* | am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-pre...Adam Powell2014-06-022-3/+21
|\ \ | |/
| * Merge "Further implementation for ToolbarActionBar" into lmp-preview-devAdam Powell2014-06-022-3/+21
| |\
| | * Further implementation for ToolbarActionBarAdam Powell2014-06-012-3/+21
* | | Merge commit '6682183b' into manualmergeAlan Viverette2014-06-011-11/+24
|\ \ \ | |/ /
| * | Fixes hotspot list transitions, update to use a single hotspotAlan Viverette2014-06-011-11/+24
| |/
* | resolved conflicts for merge of 04c987a8 to masterElliott Hughes2014-05-301-2/+2
|\ \
| * \ am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU...Elliott Hughes2014-05-311-1/+1
| |\ \
| | * \ am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."Elliott Hughes2014-05-311-1/+1
| | |\ \
| | | * | Move frameworks/base off private libcore.ICU API.Elliott Hughes2014-05-301-1/+1
| | * | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-299-118/+168
| | |\ \ \ | | | |/ / | | |/| |
| | | * | am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar"Jeff Brown2014-03-131-1/+1
| | | |\ \
| | | * \ \ am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the Fast...Alan Viverette2014-03-112-16/+25
| | | |\ \ \
| | | * \ \ \ am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-bindi...Alan Viverette2014-03-111-4/+10
| | | |\ \ \ \
| | | * \ \ \ \ am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views ar...Alan Viverette2014-03-111-73/+92
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."Elliott Hughes2014-03-081-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility b...Svetoslav2014-03-071-0/+5
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 1276295b: am a3ea4be5: Prevent SpellChecker from setting invalid range - D...Jay Shrauner2014-03-071-1/+5
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ...Deepanshu Gupta2014-04-161-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-151-2/+4
| | | * | | | | | | | | | | | am 09421fab: Re-initialize error after attachDaniel 2 Olofsson2014-03-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Re-initialize error after attachDaniel 2 Olofsson2014-03-141-1/+1
* | | | | | | | | | | | | | am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into...Adam Powell2014-05-311-44/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Collapse contentInsets and View margins in ToolbarsAdam Powell2014-05-301-44/+107
* | | | | | | | | | | | | | am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar dec...Adam Powell2014-05-301-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix action bar title TextAppearance usage for Toolbar decorAdam Powell2014-05-301-0/+22
* | | | | | | | | | | | | | am ee1a3f16: Merge "Fix for setting Toolbar content descriptions" into lmp-pr...Adam Powell2014-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix for setting Toolbar content descriptionsAdam Powell2014-05-291-1/+1
* | | | | | | | | | | | | | am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration...Adam Powell2014-05-283-65/+521
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Toolbar factoring and ActionBar functionality integrationAdam Powell2014-05-283-65/+521
* | | | | | | | | | | | | | More on weights in GridLayoutPhilip Milne2014-05-241-1/+1
* | | | | | | | | | | | | | More on adding support for weights to GridLayoutPhilip Milne2014-05-241-5/+1
* | | | | | | | | | | | | | More on weighted space distribution in GridLayoutPhilip Milne2014-05-231-58/+77
* | | | | | | | | | | | | | am e11794a2: Merge "Update switch, checkbox, radio button, button, and toggle...Alan Viverette2014-05-233-4/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Update switch, checkbox, radio button, button, and toggle buttonAlan Viverette2014-05-223-4/+55
* | | | | | | | | | | | | | Support for weights in GridLayoutPhilip Milne2014-05-221-33/+176
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Fix password obscuring in TextView accessibility node"Alan Viverette2014-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix password obscuring in TextView accessibility nodeAlan Viverette2014-05-191-1/+1
* | | | | | | | | | | | | | TouchFeedbackDrawable is now RippleDrawableAlan Viverette2014-05-194-34/+11
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Update ripple behavior, use render thread animationAlan Viverette2014-05-161-5/+23
* | | | | | | | | | | | | Merge "Implements TtmlRenderer."Sungsoo Lim2014-05-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implements TtmlRenderer.Sungsoo Lim2014-05-141-0/+2
* | | | | | | | | | | | | | Add content insets to ToolbarAdam Powell2014-05-152-4/+247
* | | | | | | | | | | | | | Merge "Enable CursorAnchorInfo to contain composing string"Yohei Yukawa2014-05-151-12/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Enable CursorAnchorInfo to contain composing stringYohei Yukawa2014-05-141-12/+18
* | | | | | | | | | | | | | | Fix layout positioning for ToolbarAdam Powell2014-05-141-9/+11
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Support IMM#updateCursorAnchorInfo in Editor"Yohei Yukawa2014-05-141-2/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \