summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* Migrate off timeFormat12 and timeFormat24.Elliott Hughes2014-10-232-5/+5
| | | | | | | | libcore now offers a wider variety of 12-/24-hour time formats, so be more specific about which one we want here. Bug: 10361358 Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
* am 1d918403: am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge ↵Bryce Lee2014-10-231-0/+6
|\ | | | | | | | | | | | | of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev * commit '1d9184035d5d74c850d688cd269e97ea3f77953e': [Theater Mode] framework implementation through global setting
| * am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to ↵Bryce Lee2014-10-231-0/+6
| |\ | | | | | | | | | | | | | | | | | | lmp-mr1-dev" into lmp-mr1-dev * commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95': [Theater Mode] framework implementation through global setting
| | * Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-devBryce Lee2014-10-231-0/+6
| | |\
| | | * resolved conflicts for merge of f03ba4f1 to lmp-mr1-devBryce Lee2014-10-221-0/+6
| | | |\ | | | | | | | | | | | | | | | Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
| | | | * Merge "[Theater Mode] framework implementation through global setting" into ↵Bryce Lee2014-10-221-0/+6
| | | | |\ | | | | | | | | | | | | | | | | | | lmp-sprout-dev
| | | | | * [Theater Mode] framework implementation through global settingBryce Lee2014-10-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17684570 Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
| | | | * | Surface:lockHardwareCanvas DO NOT MERGEJohn Reck2014-10-221-13/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17440886 Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
* | | | | | am 1338a8bd: am dc546ab7: am 720f43e4: Merge "Revert "Check ↵Alan Viverette2014-10-231-2/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev * commit '1338a8bd80d4a19c64066a18f9e58fc7456420b6': Revert "Check MenuItem.isVisible() for keyboard shortcuts"
| * | | | | am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for ↵Alan Viverette2014-10-231-2/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard shortcuts"" into lmp-mr1-dev * commit 'dc546ab7c3b53012908ce6b594f34a5d27de78e1': Revert "Check MenuItem.isVisible() for keyboard shortcuts"
| | * | | | Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into ↵Alan Viverette2014-10-231-2/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | Revert "Check MenuItem.isVisible() for keyboard shortcuts"Alan Viverette2014-10-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just kidding we do want this to work like it used to. This reverts commit e354a9e4da56da45d7035e1e93301554c5faf32e. Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
* | | | | | | am 5e1a55a3: am 0a736fa7: am 183cef06: Merge "Ensure AdapterView doesn\'t ↵Alan Viverette2014-10-231-9/+35
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post selection notifications forever" into lmp-mr1-dev * commit '5e1a55a3fa21f94dcfea3fee9a8d7e7c7e283fdc': Ensure AdapterView doesn't post selection notifications forever
| * | | | | | am 0a736fa7: am 183cef06: Merge "Ensure AdapterView doesn\'t post selection ↵Alan Viverette2014-10-231-9/+35
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications forever" into lmp-mr1-dev * commit '0a736fa7ae00ab1fcf8f12d2e1326690740c1814': Ensure AdapterView doesn't post selection notifications forever
| | * | | | | Merge "Ensure AdapterView doesn't post selection notifications forever" into ↵Alan Viverette2014-10-231-9/+35
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | lmp-mr1-dev
| | | * | | | Ensure AdapterView doesn't post selection notifications foreverAlan Viverette2014-10-071-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would loop forever if a selection notification was posted after data had changed but the data changed bit was never reset (e.g. a layout pass never occurred). This moves the pending notification to occur as part of a layoutChildren() / checkSelectionChanged() pass. If the client does horrible things to prevent layout, no notification will occur -- but we won't loop forever. BUG: 17736536 Change-Id: I9773a769ad402c92dcbe2af7b8982d4443001961
* | | | | | | am cbe7f818: am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: ↵Wale Ogunwale2014-10-223-42/+130
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PopupWindow overlaps with navigation bar." into lmp-mr1-dev * commit 'cbe7f81819ca4ffb4da53e29121911fc35be0eee': Fix issue #17789629: PopupWindow overlaps with navigation bar.
| * | | | | | am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps ↵Wale Ogunwale2014-10-223-42/+130
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with navigation bar." into lmp-mr1-dev * commit '1546422ea7b0c62e6205ab9e85a370caf1d01756': Fix issue #17789629: PopupWindow overlaps with navigation bar.
| | * | | | | Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into ↵Wale Ogunwale2014-10-223-42/+130
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | Fix issue #17789629: PopupWindow overlaps with navigation bar.Wale Ogunwale2014-10-213-42/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Lollipop release introduced a feature that allowed apps to extend under the navigation bar. This also means any popup window that is anchored to the bottom of its parent window will overlap with the navigation bar if the parent window is extending underneath the navigation bar. This change introduces a new window flag (FLAG_LAYOUT_ATTACHED_IN_DECOR) that allows the app to specify if the popup window should be attached to the decor frame of the parent window thereby avoiding an overlap with the screen decorations. By default the flag is set on SDK version LOLLIPOP_MR1 or greater and cleared on lesser SDK versions. Also, replaced flags FLAG_NEEDS_MENU_KEY and PRIVATE_FLAG_NEEDS_MENU_KEY_SET with needsMenuKey state variable to make room for the new FLAG_LAYOUT_ATTACHED_IN_DECOR flag. Bug: 17789629 Change-Id: I2150e0c6ac688c966c0e8f7e54d42fd20285bea6
* | | | | | | | am b1ed0ab9: am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable ↵Filip Gruszczynski2014-10-221-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity\'s translucency until it starts being swiped away." into lmp-sprout-dev * commit 'b1ed0ab9276c6516194d82f87abeaeb279907b3f': Disable activity's translucency until it starts being swiped away.
| * | | | | | | am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable activity\'s ↵Filip Gruszczynski2014-10-221-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translucency until it starts being swiped away." into lmp-sprout-dev * commit '78b236b3d2be713f534a033b0deb0e00b0d436a8': Disable activity's translucency until it starts being swiped away.
| | * | | | | | am baecc0b2: Merge "Disable activity\'s translucency until it starts being ↵Filip Gruszczynski2014-10-221-0/+8
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | swiped away." into lmp-sprout-dev * commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395': Disable activity's translucency until it starts being swiped away.
| | | * | | | | Disable activity's translucency until it starts being swiped away.Filip Gruszczynski2014-10-211-0/+8
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
* | | | | | | am a0579ad0: am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for ↵Alan Viverette2014-10-221-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard shortcuts" into lmp-mr1-dev * commit 'a0579ad00f13a82f4e93d4ef0264aa0d04e866c1': Check MenuItem.isVisible() for keyboard shortcuts
| * | | | | | am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard ↵Alan Viverette2014-10-221-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shortcuts" into lmp-mr1-dev * commit '5eaf00641a8dd31b4d7779749db28669e4010af3': Check MenuItem.isVisible() for keyboard shortcuts
| | * | | | | Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-devAlan Viverette2014-10-221-1/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Check MenuItem.isVisible() for keyboard shortcutsAlan Viverette2014-10-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parity with support-v7 change. BUG: 18021345 Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
* | | | | | | Merge "Refactor HWUI to better handle Canvas DrawFilters."Derek Sollenberger2014-10-221-8/+2
|\ \ \ \ \ \ \
| * | | | | | | Refactor HWUI to better handle Canvas DrawFilters.Derek Sollenberger2014-10-171-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, this CL removes the need to decompose the DrawFilters in Java and instead passes the SkDrawFilter to HWUI directly. This also allows the removal of duplicated logic between HWUI and other Canvas implementations regarding Paint filter levels. Second, the DrawFilter is now stored in the DisplayListRenderer where we apply it to every paint BEFORE it is stored in the DisplayList. This eliminates the need to filter all Paints on playback and removes additional complexity at playback. Finally, as a result of storing the filtered paint we can now do a better job caching the paints. This takes advantage of recent changes in Skia to quickly enable quick hashing and comparison of paint objects. Change-Id: Iec507a2d894827975cc4f1d22241542bb0534b4e
* | | | | | | | am bb852b0b: Merge "Format ListPreference summary with empty string if entry ↵Alan Viverette2014-10-221-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is null" into lmp-mr1-dev automerge: c4a12a7 automerge: 36a132c * commit '36a132c0a0adfd15b20c3e269d7647c050cd84aa': Format ListPreference summary with empty string if entry is null
| * | | | | | | am bb852b0b: Merge "Format ListPreference summary with empty string if entry ↵Alan Viverette2014-10-221-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is null" into lmp-mr1-dev automerge: c4a12a7 * commit 'c4a12a7ad0d6eef723b65c256cd77570b2177a28': Format ListPreference summary with empty string if entry is null
| | * | | | | | Merge "Format ListPreference summary with empty string if entry is null" ↵Alan Viverette2014-10-221-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | | | | | Format ListPreference summary with empty string if entry is nullAlan Viverette2014-10-211-2/+2
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding serif-monospace and sans-serif-monospace font families bumped out the previous monospace, which left the summary as %s. Returning an unformatted summary is never correct, and we should simply return a summary populated with an empty string. BUG: 17666124 Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
* | | | | | | | am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-devAdam Powell2014-10-213-0/+84
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 639e318 * commit '639e3181e0c3bb7fae5e05ef9edde729a67e2ac5': Intent chooser callback
| * | | | | | | am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-devAdam Powell2014-10-213-0/+84
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e055c95b77a3610452f31d2303fa35bf171acf0e': Intent chooser callback
| | * | | | | | Merge "Intent chooser callback" into lmp-mr1-devAdam Powell2014-10-213-0/+84
| | |\ \ \ \ \ \
| | | * | | | | | Intent chooser callbackAdam Powell2014-10-213-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let an app specify an IntentSender as an extra for ACTION_CHOOSER that will be notified of the user's chosen target. Apps can use this to implement things like one-touch last used affordances without implementing their own one-off chooser UI. Bug 17363684 Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
* | | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-211-13/+110
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 76f24bd * commit '76f24bde7816dd97ed2375ec41c9817be0330d9f': Surface:lockHardwareCanvas
| * | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-211-13/+110
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e73a54f33c029552469fcf1cda46eed2f360a38e': Surface:lockHardwareCanvas
| | * | | | | | | Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-211-13/+110
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Surface:lockHardwareCanvasJohn Reck2014-10-211-13/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17440886 Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
* | | | | | | | | Merge "Add Optimized Line breaking to LayoutLib"Deepanshu Gupta2014-10-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Optimized Line breaking to LayoutLibDeepanshu Gupta2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I308a7d07d98ddd7747f16e06bcffcfd14d667534
* | | | | | | | | | am 184c46a9: am c6639c26: am cc8b3e8d: Merge "Settings: Make ↵John Spurlock2014-10-212-3/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SeekBarVolumizer more null-resilient." into lmp-mr1-dev * commit '184c46a93d2ee232db6d541c1966b53a858b5ad7': Settings: Make SeekBarVolumizer more null-resilient.
| * | | | | | | | | am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more ↵John Spurlock2014-10-212-3/+6
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null-resilient." into lmp-mr1-dev * commit 'c6639c26ed6fddafd73210e535b0bb359a8192c0': Settings: Make SeekBarVolumizer more null-resilient.
| | * | | | | | | | Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-devJohn Spurlock2014-10-212-3/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Settings: Make SeekBarVolumizer more null-resilient.John Spurlock2014-10-212-3/+6
| | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the instances are reusable, ensure all "post" methods do a handler check, and ensure they are all internal. Bug: 18063070 Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
* | | | | | | | | | am c74ca441: am a74b9432: am 3d52809b: Merge "Prevent excessive ↵Alan Viverette2014-10-211-17/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility announcements in TimePicker" into lmp-mr1-dev * commit 'c74ca4415eddf821d9cf67a552b290fdb1bf1d94': Prevent excessive accessibility announcements in TimePicker
| * | | | | | | | | am a74b9432: am 3d52809b: Merge "Prevent excessive accessibility ↵Alan Viverette2014-10-211-17/+30
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | announcements in TimePicker" into lmp-mr1-dev * commit 'a74b9432e893acf8989fa9e2f553c0bdd3cc48d8': Prevent excessive accessibility announcements in TimePicker
generated by cgit v1.1 at 2025-03-15 16:16:51 +0000