Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,928 Commits 3 Branches 0 Tags
cb789f0ca0baf7bcfb7f847a33db870cc464838b
Commit Graph

46798 Commits

Author SHA1 Message Date
Alan Viverette
cb789f0ca0 am beb45a19: am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'beb45a194de370b32db36dcac2fbec6d12f926d3':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 19:47:20 +00:00
Elliott Hughes
85f60d3a03 Migrate off timeFormat12 and timeFormat24. 
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
 2014-10-23 11:06:43 -07:00
Alan Viverette
beb45a194d am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 
* commit 'eb09aaa5acd4bfaa4e71c60f23a934294b8130cd':
  Lighten action bar on light theme, use secondary color for subtitle
 2014-10-23 15:58:33 +00:00
Bryce Lee
fb9ac4c2d3 am 1d918403: am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1d9184035d5d74c850d688cd269e97ea3f77953e':
  [Theater Mode] framework implementation through global setting
 2014-10-23 09:20:00 +00:00
Alan Viverette
b4d74aa103 am 1338a8bd: am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 
* commit '1338a8bd80d4a19c64066a18f9e58fc7456420b6':
  Revert "Check MenuItem.isVisible() for keyboard shortcuts"
 2014-10-23 09:19:56 +00:00
Alan Viverette
c394711775 am 5e1a55a3: am 0a736fa7: am 183cef06: Merge "Ensure AdapterView doesn\'t post selection notifications forever" into lmp-mr1-dev 
* commit '5e1a55a3fa21f94dcfea3fee9a8d7e7c7e283fdc':
  Ensure AdapterView doesn't post selection notifications forever
 2014-10-23 09:19:52 +00:00
Bryce Lee
1d9184035d am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 
* commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95':
  [Theater Mode] framework implementation through global setting
 2014-10-23 08:01:57 +00:00
Alan Viverette
1338a8bd80 am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 
* commit 'dc546ab7c3b53012908ce6b594f34a5d27de78e1':
  Revert "Check MenuItem.isVisible() for keyboard shortcuts"
 2014-10-23 08:01:53 +00:00
Alan Viverette
5e1a55a3fa am 0a736fa7: am 183cef06: Merge "Ensure AdapterView doesn\'t post selection notifications forever" into lmp-mr1-dev 
* commit '0a736fa7ae00ab1fcf8f12d2e1326690740c1814':
  Ensure AdapterView doesn't post selection notifications forever
 2014-10-23 08:01:47 +00:00
Alan Viverette
e1201e87f4 Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev 2014-10-23 01:28:50 +00:00
Alan Viverette
bd266fef81 Lighten action bar on light theme, use secondary color for subtitle 
Also cleans up some code in ActionBarView.

BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
 2014-10-22 17:20:17 -07:00
Bryce Lee
49cb52e296 Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev 2014-10-23 00:05:42 +00:00
Alan Viverette
720f43e4a4 Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev 2014-10-23 00:05:33 +00:00
Alan Viverette
183cef06df Merge "Ensure AdapterView doesn't post selection notifications forever" into lmp-mr1-dev 2014-10-23 00:04:09 +00:00
Bryce Lee
fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev 
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
 2014-10-22 16:56:08 -07:00
Alan Viverette
e38eb4d4ef Revert "Check MenuItem.isVisible() for keyboard shortcuts" 
Just kidding we do want this to work like it used to.

This reverts commit e354a9e4da.

Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
 2014-10-22 23:51:32 +00:00
Wale Ogunwale
8c5304a95d am cbe7f818: am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit 'cbe7f81819ca4ffb4da53e29121911fc35be0eee':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:51:40 +00:00
Wale Ogunwale
cbe7f81819 am 1546422e: am d0aae5a2: Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 
* commit '1546422ea7b0c62e6205ab9e85a370caf1d01756':
  Fix issue #17789629: PopupWindow overlaps with navigation bar.
 2014-10-22 22:39:35 +00:00
Wale Ogunwale
d0aae5a222 Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev 2014-10-22 22:17:19 +00:00
Filip Gruszczynski
d6b193dcde am b1ed0ab9: am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable 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.
 2014-10-22 21:26:46 +00:00
Filip Gruszczynski
b1ed0ab927 am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit '78b236b3d2be713f534a033b0deb0e00b0d436a8':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 21:18:15 +00:00
Filip Gruszczynski
d4a52a6878 am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 20:45:59 +00:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
Alan Viverette
b6adcb8f93 am a0579ad0: am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit 'a0579ad00f13a82f4e93d4ef0264aa0d04e866c1':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:19:35 +00:00
Alan Viverette
a0579ad00f am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit '5eaf00641a8dd31b4d7779749db28669e4010af3':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:14:35 +00:00
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
Derek Sollenberger
425cc668a9 Merge "Refactor HWUI to better handle Canvas DrawFilters." 2014-10-22 15:59:28 +00:00
John Reck
2615de920b Surface:lockHardwareCanvas DO NOT MERGE 
Bug: 17440886

Cherry pick of bb2d0cc7e1

Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
 2014-10-22 08:33:31 -07:00
Alan Viverette
e23ab83731 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev automerge: c4a12a7 
automerge: 36a132c

* commit '36a132c0a0adfd15b20c3e269d7647c050cd84aa':
  Format ListPreference summary with empty string if entry is null
 2014-10-22 01:00:03 +00:00
Alan Viverette
36a132c0a0 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 
automerge: c4a12a7

* commit 'c4a12a7ad0d6eef723b65c256cd77570b2177a28':
  Format ListPreference summary with empty string if entry is null
 2014-10-22 00:45:34 +00:00
Alan Viverette
bb852b0b6b Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 2014-10-22 00:35:29 +00:00
Alan Viverette
13e13ddd4e Format ListPreference summary with empty string if entry is null 
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
 2014-10-21 17:05:07 -07:00
Adam Powell
3ce4c0712d am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev 
automerge: 639e318

* commit '639e3181e0c3bb7fae5e05ef9edde729a67e2ac5':
  Intent chooser callback
 2014-10-21 23:38:48 +00:00
John Reck
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
 2014-10-21 23:34:46 +00:00
Bryce Lee
584a445179 [Theater Mode] framework implementation through global setting 
Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
 2014-10-21 15:55:55 -07:00
Deepanshu Gupta
eea621810c Merge "Add Optimized Line breaking to LayoutLib" 2014-10-21 22:44:38 +00:00
Deepanshu Gupta
7053919a3a Add Optimized Line breaking to LayoutLib 
Change-Id: I308a7d07d98ddd7747f16e06bcffcfd14d667534
 2014-10-21 15:43:53 -07:00
Filip Gruszczynski
3f8dd14451 Disable activity's translucency until it starts being swiped away. 
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
 2014-10-21 15:12:00 -07:00
Adam Powell
639e3181e0 am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev 
* commit 'e055c95b77a3610452f31d2303fa35bf171acf0e':
  Intent chooser callback
 2014-10-21 21:49:55 +00:00
Adam Powell
054e8be5e0 Merge "Intent chooser callback" into lmp-mr1-dev 2014-10-21 21:41:19 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
Wale Ogunwale
393b1c1e88 Fix issue #17789629: PopupWindow overlaps with navigation bar. 
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
 2014-10-21 12:45:53 -07:00
Alan Viverette
e354a9e4da Check MenuItem.isVisible() for keyboard shortcuts 
Parity with support-v7 change.

BUG: 18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
 2014-10-21 12:21:32 -07:00
Adam Powell
0b3c11260a Intent chooser callback 
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
 2014-10-21 12:17:50 -07:00
John Spurlock
2e594f1eb5 am 184c46a9: am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 
* commit '184c46a93d2ee232db6d541c1966b53a858b5ad7':
  Settings: Make SeekBarVolumizer more null-resilient.
 2014-10-21 18:53:43 +00:00
John Spurlock
184c46a93d am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 
* commit 'c6639c26ed6fddafd73210e535b0bb359a8192c0':
  Settings: Make SeekBarVolumizer more null-resilient.
 2014-10-21 18:48:18 +00:00
John Spurlock
cc8b3e8d4e Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 2014-10-21 18:39:20 +00:00
Alan Viverette
c93ca4506b am c74ca441: am a74b9432: am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 
* commit 'c74ca4415eddf821d9cf67a552b290fdb1bf1d94':
  Prevent excessive accessibility announcements in TimePicker
 2014-10-21 18:38:58 +00:00