drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,866 Commits 1 Branch 0 Tags
Commit Graph

10371 Commits

Author SHA1 Message Date
Alan Viverette
59a1b2e617 am c9eda8e5: am dccc66d4: am bb7bce8f: Merge "Remove background override for sw720dp preference panel" into lmp-dev 
* commit 'c9eda8e502c012d2cd2965f911e77bd50826fc72':
  Remove background override for sw720dp preference panel
 2014-09-12 19:25:46 +00:00
Alan Viverette
10d3865f62 am 710e47b1: am 3a8bbe22: am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 
* commit '710e47b11c32c3b8ac08de9af639d42c7d730b3b':
  Make the TimePicker and light DatePicker styles public
 2014-09-12 19:25:35 +00:00
Alan Viverette
4ca5722377 am 71c9592f: am 4fb30f67: am fe4b935f: Merge "Move padding back into to the dialog message" into lmp-dev 
* commit '71c9592f02e6f61b1693166fb004f1081a2a5558':
  Move padding back into to the dialog message
 2014-09-12 19:25:31 +00:00
Alan Viverette
55e948e41f am 30225f51: am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit '30225f51f0c00043c96f6f74e10a5181c1c4b10b':
  Vertically align toolbar child views with similar gravities
 2014-09-12 19:24:27 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
vandwalle
98ed2262e1 am 3cf637e4: am 5bb3b182: am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev 
* commit '3cf637e4b07ffe997f418d6c42da7864d33f029f':
  add option to link only same credential configurations
 2014-09-12 19:22:41 +00:00
Alan Viverette
2d6d14deb0 am a56d7668: am bff3a6cf: am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 
* commit 'a56d7668bb5705688cecdaad31af6644e7b4beb4':
  Enable adjustViewBounds on preference icon so that maxWidth is used
 2014-09-12 19:19:31 +00:00
RoboErik
e8ea965a1d am c8ee3532: am d898ddba: am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev 
* commit 'c8ee353245bee076899107e495f57457eba216ef':
  Update text appearance in leanback setup
 2014-09-12 19:19:18 +00:00
Vineeta Srivastava
8431236c18 am f1b25e21: am 758fb0cb: am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'f1b25e2107f445deebd9ed9b5178b9f82e2311c3':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-12 19:18:56 +00:00
ztenghui
0421e5f947 am 85c9f80a: am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '85c9f80a2ce712891fec9411562bd0cb48249586':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-12 19:18:25 +00:00
Jorim Jaggi
e1e407d74d am 207f62e9: am 0d58a4a2: am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit '207f62e9c9d5547f3cc18a462a2a7b8ef6432791':
  Fix inconsistent layout param in notification
 2014-09-12 18:03:53 +00:00
Alan Viverette
a75de49a8e am dccc66d4: am bb7bce8f: Merge "Remove background override for sw720dp preference panel" into lmp-dev 
* commit 'dccc66d460124652489312a711d56216c32cd86b':
  Remove background override for sw720dp preference panel
 2014-09-12 05:46:58 +00:00
Alan Viverette
5a44fbdd74 am 3a8bbe22: am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 
* commit '3a8bbe22e2b2439fcc628c6bc460fd1ec52f20bb':
  Make the TimePicker and light DatePicker styles public
 2014-09-12 05:46:48 +00:00
Alan Viverette
4ddc9712c5 am 4fb30f67: am fe4b935f: Merge "Move padding back into to the dialog message" into lmp-dev 
* commit '4fb30f67850420fff76f46ac2ba621500195a589':
  Move padding back into to the dialog message
 2014-09-12 05:46:43 +00:00
Alan Viverette
1c3d3e6a01 am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit 'bba2b9e8221a91dd03036b47e90f1ea364dc4fd2':
  Vertically align toolbar child views with similar gravities
 2014-09-12 05:45:53 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 05:44:51 +00:00
vandwalle
baf0d11475 am 5bb3b182: am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev 
* commit '5bb3b18271faabae05271c3c47c0bcbc8ca55fec':
  add option to link only same credential configurations
 2014-09-12 05:44:09 +00:00
Alan Viverette
74239e322f am bb7bce8f: Merge "Remove background override for sw720dp preference panel" into lmp-dev 
* commit 'bb7bce8f014644dcd54d3ce24ddbf96ac6ff5213':
  Remove background override for sw720dp preference panel
 2014-09-12 05:05:09 +00:00
Alan Viverette
03565bfa31 am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 
* commit '534c3d3900406e30cd3ee15703ee9c2f9d362b0b':
  Make the TimePicker and light DatePicker styles public
 2014-09-12 05:04:59 +00:00
Alan Viverette
e8264992e5 am fe4b935f: Merge "Move padding back into to the dialog message" into lmp-dev 
* commit 'fe4b935fc89efa8d00546a988df7e6ed9530ded9':
  Move padding back into to the dialog message
 2014-09-12 05:04:54 +00:00
Alan Viverette
ae1a488be2 am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit '8c7810a451cc28e67a8565fd1c63ee9fb0fc9c2d':
  Vertically align toolbar child views with similar gravities
 2014-09-12 05:04:08 +00:00
George Mount
fbb6299907 am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '3081e3601760871fea78d878e752b556974cb55b':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 05:03:12 +00:00
vandwalle
b12e0178bc am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev 
* commit 'c7fd0da2d924ac2b3f60288c777349020220fd33':
  add option to link only same credential configurations
 2014-09-12 05:02:34 +00:00
Alan Viverette
e9939c110e Merge "Remove background override for sw720dp preference panel" into lmp-dev 2014-09-12 01:28:46 +00:00
Alan Viverette
934f81a2a4 Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev 2014-09-12 01:21:53 +00:00
Alan Viverette
5a05a21680 Merge "Move padding back into to the dialog message" into lmp-dev 2014-09-12 01:20:59 +00:00
Alan Viverette
87eaaf0f87 Make the TimePicker and light DatePicker styles public 
BUG: 17478212
Change-Id: I0b1b5db6973807a42d9d13479f3db3ac513e8290
 2014-09-11 17:55:42 -07:00
Alan Viverette
95b1f84313 Remove background override for sw720dp preference panel 
BUG: 17449927
Change-Id: I8a52a7c2b25028c450e838890bd061fc00fd6f03
 2014-09-11 17:14:47 -07:00
Alan Viverette
446666c57d Move padding back into to the dialog message 
Makes lists look weird, but we need some dynamic adjustment of padding
if we're going to handle every combination of buttons/message/etc.

BUG: 17460357
Change-Id: I2990f72f3761f3a0e9cf5d295101af2b99685cff
 2014-09-11 16:37:05 -07:00
Alan Viverette
34e53ab66e Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 2014-09-11 23:24:48 +00:00
Alan Viverette
e3cb7baeb9 Vertically align toolbar child views with similar gravities 
Also fixes Body1 text size, action bar title size on sw600dp-land.

BUG: 17266152
Change-Id: Ib686dd6e80dfcdad920c922a532f4f5d6252fa19
 2014-09-11 16:23:29 -07:00
George Mount
db352c7835 Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 2014-09-11 21:54:13 +00:00
vandwalle
b55ccdad03 Merge "add option to link only same credential configurations" into lmp-dev 2014-09-11 21:05:54 +00:00
George Mount
9826f636ad Have Activity Transitions activited by a new window attribute. 
Bug 17006497

Window content transitions were being enabled by default in
the Material Theme so that Activity Transitions could be
enabled by default. Unfortunately, this gave the effect that
many applications did not want -- the default transition between
window content is a fade out/in. Here, a new attribute is
added: windowActivityTransitions that is enabled by default
in the Material theme and windowContentTransitions is disabled
by default in all themes.

Change-Id: Iab453d608f00a48ff7ab7f09ce84b52cf5f20294
 2014-09-11 12:23:17 -07:00
Alan Viverette
8aea37efcc am bff3a6cf: am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 
* commit 'bff3a6cfcc656d336f5d96a6bdc4045c63076924':
  Enable adjustViewBounds on preference icon so that maxWidth is used
 2014-09-11 18:39:59 +00:00
RoboErik
d45e61f14d am d898ddba: am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev 
* commit 'd898ddba1f86927b1ddf89e8e06386fb0eb4915b':
  Update text appearance in leanback setup
 2014-09-11 18:39:49 +00:00
Vineeta Srivastava
74ff422b09 am 758fb0cb: am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit '758fb0cb37666a14ed8e198f95a482b8739537b3':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-11 18:32:14 +00:00
Alan Viverette
213b77fbe9 am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 
* commit 'f871566adb6a2a1bc5827405712a7ebeb180d9d4':
  Enable adjustViewBounds on preference icon so that maxWidth is used
 2014-09-11 18:30:41 +00:00
ztenghui
2a67fa92f0 am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '548b92941c8cea5c3aa125c0fe6ea69748c18591':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 18:30:30 +00:00
Alan Viverette
cdea76488d Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 2014-09-11 18:27:43 +00:00
RoboErik
d746f70aec am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev 
* commit '6bd52db9dfc62f742a5bd6e2ac13b18a2f1ab859':
  Update text appearance in leanback setup
 2014-09-11 18:25:18 +00:00
RoboErik
1308c4b82b Merge "Update text appearance in leanback setup" into lmp-dev 2014-09-11 18:21:33 +00:00
Vineeta Srivastava
7c90b84ba4 am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'bc067325de8197a38feec3782a64e02023c9170d':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-11 17:51:41 +00:00
Vineeta Srivastava
e14a29ff3d Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 2014-09-11 17:41:02 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
vandwalle
37b26b4cea am 0689adb0: am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev 
* commit '0689adb05583357b213ec0ce491cdcd5a7080074':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
 2014-09-11 17:23:46 +00:00
Svetoslav
bff7a979a8 am dbd75236: am b875ca77: am 0f2e085d: Merge "RTL support for print UI." into lmp-dev 
* commit 'dbd75236e88d2ed43d63d65e57d0b9cb6a7b48af':
  RTL support for print UI.
 2014-09-11 17:22:16 +00:00
RoboErik
7a058d4c5e Update text appearance in leanback setup 
Changes the size and inter-line spacing.

bug:16959057
Change-Id: Iaf3dcb6c60d071920d73ac2f86e01b6d4248ebf9
 2014-09-11 10:03:27 -07:00
Jing Zhao
ad6f28202a Send empty flash for some CDMA carriers for 3way call 
Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
 2014-09-11 09:49:45 -07:00
ztenghui
987c7e0967 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:44:17 +00:00