Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,082 Commits 3 Branches 0 Tags
705f2ac42412c8a5a436f0044b84ebbcd1e9c729
Commit Graph

45698 Commits

Author SHA1 Message Date
George Mount
890f20e8e8 am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '039cc060493a88a603cc8f3224a9ac2fa31908be':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 22:04:28 +00:00
Yigit Boyar
ab43570f5d am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'f3ab441090a05bd428b9488b2e8e175f33bd6fe9':
  Added a generic configuration and theme based cache
 2014-10-23 22:04:11 +00:00
John Reck
35447aeabd am fed6f4ef: am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev 
* commit 'fed6f4ef2310ab3ec33d439702ea47f9b623795a':
  Improve documentation
 2014-10-23 22:04:01 +00:00
Alan Viverette
cccea2b976 am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 
* commit '265f8106c374ce72284e86a5bb6df4514d320d51':
  Swap names for clock delegates so they are correct
 2014-10-23 22:03:43 +00:00
George Mount
b5742f997d am 941252d3: am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 
* commit '941252d3f002bbace92212e4f6340980984ce3ae':
  Use one method to change bounds in ChangeBounds.
 2014-10-23 22:03:38 +00:00
Pavel Zhamaitsiak
34e4dc4b09 am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit 'b01a597924ab7afed689f7710c264684d1fac944':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:02:59 +00:00
Filip Gruszczynski
2c90a0282b am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit '2e052429d04c11b69b3b3ac85a6344bd3687a0dc':
  Check if context is actually an activity.
 2014-10-23 22:02:48 +00:00
Sreeram Ramachandran
4573944e96 am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 22:02:25 +00:00
George Mount
82fd842827 Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 2014-10-23 21:46:54 +00:00
Yigit Boyar
fa9ed8ca0a Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 2014-10-23 21:06:24 +00:00
John Reck
aca6ccf403 Merge "Improve documentation" into lmp-mr1-dev 2014-10-23 21:00:45 +00:00
John Reck
43a5328c83 Improve documentation 
Bug: 17440886

Change-Id: I3f5c0dab6e08c0097fe60eb269e7fffe7b48b563
 2014-10-23 13:58:34 -07:00
Alan Viverette
4ad964d98d Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 2014-10-23 20:52:23 +00:00
George Mount
523a129ced Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 2014-10-23 20:52:13 +00:00
Alan Viverette
daf33ed853 Swap names for clock delegates so they are correct 
Change-Id: Ic11affae802f0afe4746f65f0b96979a7c5a9c0a
 2014-10-23 13:34:17 -07:00
Pavel Zhamaitsiak
c8a09d5434 Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 2014-10-23 20:24:12 +00:00
George Mount
d359952459 Use one method to change bounds in ChangeBounds. 
Bug 17936593

Instead of calling setLeft(), setTop(), setRight(), setBottom()
separately, make one call that does all at the same time.

Change-Id: I986274f3a98b3136e71204501ffc272986ad31dd
 2014-10-23 13:08:15 -07:00
Filip Gruszczynski
b977ade1e4 am 625ec484: Check if context is actually an activity. 
* commit '625ec4849118f061a99558ad558b16020435a88d':
  Check if context is actually an activity.
 2014-10-23 19:49:21 +00:00
Etan Cohen
e41a9cf9f7 Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT. 
Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
 2014-10-23 19:15:13 +00:00
Sreeram Ramachandran
b1df48e469 Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 2014-10-23 19:10:24 +00:00
Yigit Boyar
d422dc358f Added a generic configuration and theme based cache 
For now, only animators use it but we can consider migrating
drawable cache to it as well.

Bug: 17456416
Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
 2014-10-23 11:46:01 -07:00
Filip Gruszczynski
625ec48491 Check if context is actually an activity. 
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
 2014-10-23 10:56:24 -07:00
Svet Ganov
ae23078b23 am 012b4eae: am d8bc6677: Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 
* commit '012b4eae10216648b2cff082e2c7809a1b0489a7':
  Optimize text rendering in accessibility mode.
 2014-10-23 15:58:43 +00:00
Alan Viverette
d439b034cb am 171c98bd: am e8f676c0: Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 
* commit '171c98bd71c97a7f37c5274a2e37c359837cf9e3':
  Use correct smooth scroll default duration
 2014-10-23 15:58:38 +00: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
Sreeram Ramachandran
e15db7c23d Add an API to select a network for a DatagramSocket. 
Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
 2014-10-23 08:37:33 -07: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
Svet Ganov
d8bc6677e5 Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev 2014-10-23 01:55:44 +00:00
Alan Viverette
e8f676c0e5 Merge "Use correct smooth scroll default duration" into lmp-mr1-dev 2014-10-23 01:29:06 +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
Alan Viverette
3b415e41cc Use correct smooth scroll default duration 
BUG: 18092378
Change-Id: I503677129edb647b7970b4e39a175289d5798e1b
 2014-10-22 16:19:57 -07: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
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
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
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
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