Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,015 Commits 3 Branches 0 Tags
5b0c065798b7e8f343f2a11dd9422a02eaedeae1
Commit Graph

47211 Commits

Author SHA1 Message Date
Alan Viverette
5b0c065798 am b65a27da: am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'b65a27da39b53019f626bc9a380f0cad7e363bb8':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:36:54 +00:00
John Spurlock
57177c75ea am 68fdbd01: am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit '68fdbd01798dad380581d02c5b9d229aecb10ef0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:36:32 +00:00
Alan Viverette
613d43473e am 71c27899: am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '71c2789930de7fb1b98ad10ea6a5e6f23500ead2':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:36:28 +00:00
Alan Viverette
b65a27da39 am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
  Remove scroll view from correct parent in AlertController
 2014-10-31 00:29:29 +00:00
John Spurlock
68fdbd0179 am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit 'a0adb0bd46389b7ac0474b7727cdbdb36d0d48a0':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-31 00:28:28 +00:00
Alan Viverette
71c2789930 am e9e7d012: am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit 'e9e7d012dd7df56227854fd0887b6f0476db8b67':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-31 00:28:11 +00:00
Lorenzo Colitti
3d62297e85 am fa186dbd: am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'fa186dbd3dce56dfc209b7c10a3bc66e7036055d':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:26:10 +00:00
Chris Banes
8094de110e am 3726cd12: am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '3726cd1285032baa9810c81fa99cdb6dc082ceac':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:26:00 +00:00
Yigit Boyar
e905d36dcb am 9d0a2dc1: am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '9d0a2dc15daebc448f239e5b968bf272dde7924e':
  Move all actionbar related methods to DecorToolbar
 2014-10-31 00:25:47 +00:00
Alan Viverette
8fae7382b9 am af896cc7: am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'af896cc719bd0e393f6050598570a34d3b29b6be':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-31 00:25:42 +00:00
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:25:37 +00:00
Alan Viverette
5d53065849 am 349e93ea: am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '349e93ea651b9153b7f7127c4f489a11df51b3aa':
  Show scroll indicators in AlertDialog
 2014-10-31 00:25:28 +00:00
Adam Lesinski
b8b49f3084 am 5231a1ed: am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '5231a1edf4808e181daf3bfeaef5a10453929498':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:25:13 +00:00
Lorenzo Colitti
fa186dbd3d am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:16:09 +00:00
Chris Banes
3726cd1285 am 95e3322c: am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit '95e3322c93fbfa4806f5ec0c63478854b4b29396':
  Fix ActionMenuView vertical alignment of items
 2014-10-31 00:15:48 +00:00
Yigit Boyar
9d0a2dc15d am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev 
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
  Move all actionbar related methods to DecorToolbar
 2014-10-31 00:15:16 +00:00
Alan Viverette
af896cc719 am ce0bc264: am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev 
* commit 'ce0bc26443bb61832ac59a0d367b9ec1a540301b':
  Ensure ImageView.setImageResource() always resolves Drawable
 2014-10-31 00:15:09 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Alan Viverette
349e93ea65 am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev 
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
  Show scroll indicators in AlertDialog
 2014-10-31 00:14:38 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
Alan Viverette
14d3b42d5a am c2663dfd: am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit 'c2663dfdab293c233e230f637b8aaf4bc79bf8d0':
  Update drawable state after updating tint list
 2014-10-31 00:01:33 +00:00
Alan Viverette
9b0ac44b41 am b50a6f39: am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'b50a6f39ca8bafee342852de50029077be47334f':
  Add setters for window elevation and clipToOutline properties
 2014-10-31 00:01:21 +00:00
Alan Viverette
d99cbd96a6 am aff329f8: am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit 'aff329f867ef06f8caf86b60da2a14e7cec2f2bb':
  Ensure accessibility focus rect is drawn correctly
 2014-10-31 00:01:16 +00:00
Alan Viverette
843f1c1926 am 136974c0: am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '136974c0668b05e9951f6f8c748d6cc42633eb39':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-31 00:01:11 +00:00
Jeff Hao
ab3ff04d52 am 05ea3213: am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-31 00:00:57 +00:00
Alan Viverette
4bcd4a14e6 am bfc8599f: am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'bfc8599f43971fc11a7d1e67e557a83b3d476609':
  Use action mode context for ActionMode menu inflater
 2014-10-31 00:00:48 +00:00
Andre Eisenbach
c76b3ef6f9 am 8018fae1: am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit '8018fae1c1747f0b940276650987aa68e9a16345':
  Fix crash during Bluetooth on/off stress test
 2014-10-31 00:00:29 +00:00
Alan Viverette
571355d9f5 am 7d965566: am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '7d96556604046bb0c0f4e4c6e5ac4ca487cdbb06':
  Add content description to Toolbar collapse button
 2014-10-30 23:59:43 +00:00
Alan Viverette
c2663dfdab am 0ab3e1df: am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit '0ab3e1df1de76f54296eefb1df05664950da8d2b':
  Update drawable state after updating tint list
 2014-10-30 23:44:49 +00:00
Alan Viverette
b50a6f39ca am baed009e: am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit 'baed009eaeaacffef7cc0972517434451e357aef':
  Add setters for window elevation and clipToOutline properties
 2014-10-30 23:44:37 +00:00
Alan Viverette
aff329f867 am 9b5a4e9d: am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit '9b5a4e9dafda3c9c5c62d3d7cf151f13c4126309':
  Ensure accessibility focus rect is drawn correctly
 2014-10-30 23:44:31 +00:00
Alan Viverette
136974c066 am 19b1c266: am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '19b1c26622bd17165f2bb187fcddf036fd3f53cd':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-30 23:44:25 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Alan Viverette
bfc8599f43 am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
  Use action mode context for ActionMode menu inflater
 2014-10-30 23:43:58 +00:00
Andre Eisenbach
8018fae1c1 am dfc47254: am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit 'dfc472542f22469aca4982d4b87ed3e1d699f473':
  Fix crash during Bluetooth on/off stress test
 2014-10-30 23:43:37 +00:00
Alan Viverette
7d96556604 am 73ab31f6: am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '73ab31f610e15e5bb275132845f0146caa4039c6':
  Add content description to Toolbar collapse button
 2014-10-30 23:42:46 +00:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController 
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
 2014-10-30 13:51:21 -07:00
Chris Wren
e9b498fb41 am e52d0d68: am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev automerge: b3239da 
* commit 'e52d0d68c4c192340ef48a2c750babfd48c090e3':
  Reveal notification listener settings APIs.
 2014-10-30 19:24:29 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
Erik Kline
c706f68d21 am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d 
* commit '0d74973a08ebe4b7547100f7d60db07152cbbcd4':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:15:45 +00:00
Lorenzo Colitti
5c313dccad am 2f3dab85: am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev automerge: ba69b3f 
* commit '2f3dab8585a1a11d2576a8b3164defe95191d513':
  Support more than one clatd at a time.
 2014-10-30 19:10:46 +00:00
Alan Viverette
c5b0309bf8 am 25128b0b: am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev automerge: b00c424 
* commit '25128b0b5a0472068ec73ac83082dc2e3429d144':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:10:41 +00:00
Shishir Agrawal
e6d4f45611 am 060afd45: am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev automerge: 47fa171 
* commit '060afd455fa8260c7ea262d0c1d2d555bc6771ea':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:10:37 +00:00
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:05:27 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
John Spurlock
fc2b9039b8 Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 2014-10-30 18:12:23 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Alan Viverette
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00