Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,635 Commits 3 Branches 0 Tags
9b1bef00aeb733913642e926d60bdf7037330762
Commit Graph

39635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
9b1bef00ae am 0001f1e8: am 2ea2553b: Merge "Update large-screen translations." into honeycomb 
* commit '0001f1e8f9ec931d90dfa3ee480ec34bcf570c36':
  Update large-screen translations.
 2011-01-11 17:43:23 -08:00
Eric Fischer
0001f1e8f9 am 2ea2553b: Merge "Update large-screen translations." into honeycomb 
* commit '2ea2553bda727f60fb05043cd13588091533f551':
  Update large-screen translations.
 2011-01-11 17:41:01 -08:00
Eric Fischer
2ea2553bda Merge "Update large-screen translations." into honeycomb 2011-01-11 17:39:12 -08:00
Justin Ho
45ff7c3bd2 am e2d63a47: am 2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb 
* commit 'e2d63a4794d4280c3c562e519c15be2edad869d5':
  Updated expander assets from Gingerbread
 2011-01-11 17:39:08 -08:00
Justin Ho
e2d63a4794 am 2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb 
* commit '2d2899f9ff292ecb7d1d8564ed52229bdd93819b':
  Updated expander assets from Gingerbread
 2011-01-11 17:36:38 -08:00
Justin Ho
2d2899f9ff Merge "Updated expander assets from Gingerbread" into honeycomb 2011-01-11 17:34:34 -08:00
Justin Ho
9c2a702722 Updated expander assets from Gingerbread 
Change-Id: Ieb5e47bc6907e6805ae55be3a9efa13b47309cdd
 2011-01-11 17:33:10 -08:00
Irfan Sheriff
7f338c460f am f537bbdd: am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb 
* commit 'f537bbdda0e0b7bd8052d278b8970d59477cd6c1':
  default wifi sleep policy change
 2011-01-11 17:31:12 -08:00
Irfan Sheriff
f537bbdda0 am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb 
* commit '7ac190d60d794b5f75b094a0b9a3f666742d42fb':
  default wifi sleep policy change
 2011-01-11 17:28:39 -08:00
Xavier Ducrohet
45b6fcc543 am 889d91cc: am 3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb 
* commit '889d91cc302f4afa01f7069a697d3ea9e5108355':
  LayoutLib: Log error when style can't be found.
 2011-01-11 17:28:00 -08:00
Irfan Sheriff
7ac190d60d Merge "default wifi sleep policy change" into honeycomb 2011-01-11 17:26:18 -08:00
Xavier Ducrohet
889d91cc30 am 3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb 
* commit '3a762f2fd1447868c028978ef57801f5f246a504':
  LayoutLib: Log error when style can't be found.
 2011-01-11 17:25:27 -08:00
Xavier Ducrohet
3a762f2fd1 Merge "LayoutLib: Log error when style can't be found." into honeycomb 2011-01-11 17:24:06 -08:00
Joe Onorato
af5b70bfbc am dc9bcdf4: am 14770e04: Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb 
* commit 'dc9bcdf45cad5c0d289e68d0854261ef904aeded':
  The status bar half of making the status bar resize when hdmi is plugged in.
 2011-01-11 17:12:34 -08:00
Joe Onorato
1ab873c8e1 am 1a6e72fd: am d938e216: Merge "Update AppWidgetHostActivity to work again." into honeycomb 
* commit '1a6e72fd05fe8387a560294ce07f348780f22de4':
  Update AppWidgetHostActivity to work again.
 2011-01-11 17:12:31 -08:00
Joe Onorato
dc9bcdf45c am 14770e04: Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb 
* commit '14770e049e10377bd963623891ccb0976b2dd6ee':
  The status bar half of making the status bar resize when hdmi is plugged in.
 2011-01-11 17:11:09 -08:00
Joe Onorato
1a6e72fd05 am d938e216: Merge "Update AppWidgetHostActivity to work again." into honeycomb 
* commit 'd938e216cb24f7c154cf62135e90b8e6f3de2464':
  Update AppWidgetHostActivity to work again.
 2011-01-11 17:11:02 -08:00
Xavier Ducrohet
d7cbf3f72c LayoutLib: Log error when style can't be found. 
Change-Id: I9a88cdac44a2d31c053e7f0c92a14e69bd82ac83
 2011-01-11 17:11:01 -08:00
Joe Onorato
14770e049e Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb 2011-01-11 17:09:16 -08:00
Joe Onorato
d938e216cb Merge "Update AppWidgetHostActivity to work again." into honeycomb 2011-01-11 17:08:52 -08:00
Joe Onorato
dc10030581 The status bar half of making the status bar resize when hdmi is plugged in. 
Change-Id: Ia349413774ba709fb3242780671c7b459850f4a4
 2011-01-11 17:07:41 -08:00
Eric Fischer
67145ddd4a Update large-screen translations. 
Change-Id: Iff616447f1cd547d887c0aa84071daa34166a5ad
 2011-01-11 16:59:54 -08:00
Justin Ho
1de969ff84 am eb23129e: am 1a6c5b64: Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb 
* commit 'eb23129e77238e8427e68c5f3dbb88b15d57bfda':
  Dropdown, checkboxes, buttons from Gingerbread
 2011-01-11 16:14:22 -08:00
Justin Ho
eb23129e77 am 1a6c5b64: Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb 
* commit '1a6c5b64deac492bc58eb94ffdb0ba21aa1934f0':
  Dropdown, checkboxes, buttons from Gingerbread
 2011-01-11 16:13:06 -08:00
Justin Ho
1a6c5b64de Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb 2011-01-11 16:11:35 -08:00
Adam Powell
c223198639 am 43184560: am 16ffa6cb: Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb 
* commit '431845609fa88f133d719b4e7efe8466b592e2e0':
  Fix bug 3338079 - Dialog styled activity decor
 2011-01-11 16:01:54 -08:00
Justin Ho
6c3c2f9ff7 Dropdown, checkboxes, buttons from Gingerbread 
Change-Id: Iec4818958f7a0cf41dab94695a06b9b3d0f72acb
 2011-01-11 16:00:39 -08:00
Adam Powell
431845609f am 16ffa6cb: Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb 
* commit '16ffa6cb2d31d130bb0b58afca31c461c784ce5d':
  Fix bug 3338079 - Dialog styled activity decor
 2011-01-11 15:59:54 -08:00
Adam Powell
16ffa6cb2d Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb 2011-01-11 15:58:29 -08:00
Adam Powell
32aa2c90ee Fix bug 3338079 - Dialog styled activity decor 
Fixed a bug in FastScroller that could cause a crash on an empty list
in always-show mode.

Fix holo light button text color

Change-Id: I7b50043d715b9b870eb34808017d743ba64d2e08
 2011-01-11 15:57:07 -08:00
Justin Ho
327ce9a9b2 am 3bb4a545: am 9b5b54b7: Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb 
* commit '3bb4a5451ea202974e65c774acac64711adfdfd0':
  List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
 2011-01-11 15:44:23 -08:00
Justin Ho
e9d7e42e9a am 4f38ffa1: am d5c91fe0: Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb 
* commit '4f38ffa1158cb2b99c31c7ae8260556e75edd48a':
  Updated HDPI btn_default states from Gingerbread
 2011-01-11 15:44:16 -08:00
Justin Ho
3bb4a5451e am 9b5b54b7: Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb 
* commit '9b5b54b72349982213c1482cfdf2908346921ecd':
  List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
 2011-01-11 15:41:37 -08:00
Justin Ho
4f38ffa115 am d5c91fe0: Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb 
* commit 'd5c91fe067d7d65d0a5b31954218d2795f2b7f58':
  Updated HDPI btn_default states from Gingerbread
 2011-01-11 15:41:34 -08:00
Irfan Sheriff
96b10d669e default wifi sleep policy change 
Keep wifi sleep policy as never when charged as long as
user has not changed the settings

Bug: 3038345
Change-Id: I0598af41fe0144f2dfddc5bd331bd91d91e0ffea
 2011-01-11 15:40:35 -08:00
Xavier Ducrohet
60eb2be0bb am 4eca2629: am 85de0087: Merge "LayoutLib: misc fix." into honeycomb 
* commit '4eca262902644d38b0f2a593a54cc67cbc28477c':
  LayoutLib: misc fix.
 2011-01-11 15:40:02 -08:00
Justin Ho
9b5b54b723 Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb 2011-01-11 15:39:40 -08:00
Justin Ho
d5c91fe067 Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb 2011-01-11 15:39:10 -08:00
Xavier Ducrohet
4eca262902 am 85de0087: Merge "LayoutLib: misc fix." into honeycomb 
* commit '85de0087fc6a65a66d3994f0b8dd3fecd9db2526':
  LayoutLib: misc fix.
 2011-01-11 15:37:21 -08:00
Xavier Ducrohet
85de0087fc Merge "LayoutLib: misc fix." into honeycomb 2011-01-11 15:34:44 -08:00
Andreas Huber
57c1925d86 am d22f7149: am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb 
* commit 'd22f7149736aba8f8e4ac4c7b1e307c2ddd0fb04':
  Increase cache size and low-watermark threshold, also
 2011-01-11 15:25:29 -08:00
Andreas Huber
6cbc59baa2 am 850e76b4: am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 
* commit '850e76b426be9330a8ef5928e173aa809d62564d':
  Properly parse Matroska lacing flags and extract all frames contained in a block.
 2011-01-11 15:25:26 -08:00
Romain Guy
14cb46ba21 am b497fa65: am b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb 
* commit 'b497fa65a84f22591766c451920ef716a0c16cec':
  Solve translucency issue when drawing paths.
 2011-01-11 15:25:22 -08:00
Andreas Huber
d22f714973 am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb 
* commit '0827e697a9965195ca12ba593332c555702aa94a':
  Increase cache size and low-watermark threshold, also
 2011-01-11 15:22:46 -08:00
Andreas Huber
850e76b426 am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 
* commit '7f92be88e0d89a693bed4d620a83aea1a989c68e':
  Properly parse Matroska lacing flags and extract all frames contained in a block.
 2011-01-11 15:22:42 -08:00
Romain Guy
b497fa65a8 am b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb 
* commit 'b796889671c089fb7e2fc4498aa701d3e8e552a3':
  Solve translucency issue when drawing paths.
 2011-01-11 15:22:39 -08:00
Andreas Huber
0827e697a9 Merge "Increase cache size and low-watermark threshold, also" into honeycomb 2011-01-11 15:20:39 -08:00
Gloria Wang
0e89c2ad5f am 3b7983cf: am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." 
* commit '3b7983cfea8885e394e7d625a31cbd0ae71e8edb':
  DRM Framework bug fixes.
 2011-01-11 15:19:52 -08:00
Scott Main
294cd472d9 resolved conflicts for merge of e15c4e4d to master 
Change-Id: Id4bd0d0aac5603f129a87fdf4dc33831aea3addf
 2011-01-11 15:16:57 -08:00
Andreas Huber
7f92be88e0 Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 2011-01-11 15:16:04 -08:00