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

43509 Commits

Author SHA1 Message Date
Christopher Lane
1bb81dd46e am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9 
* commit 'c56a9d10f7b5ffa9a6023f3dff043cbea8b3cb96':
  Add convenience method for getting the complex unit type
 2014-10-31 22:13:29 +00:00
Christopher Lane
c56a9d10f7 am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 
automerge: 38d6cf9

* commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815':
  Add convenience method for getting the complex unit type
 2014-10-31 22:07:30 +00:00
Christopher Lane
be36ebc28d Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev 2014-10-31 22:01:35 +00:00
Christopher Lane
9f357ae9f0 Add convenience method for getting the complex unit type 
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
 2014-10-31 14:52:06 -07:00
George Mount
486384ef46 am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500 
* commit '0d6624d35af7c7623cf97084753255079b01fbdf':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:43:21 +00:00
George Mount
0d6624d35a am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 
automerge: 7bce500

* commit '7bce5007d2b2b218d11514a3df8e7109e37d9e7c':
  Ensure views are attached prior to starting enter transition.
 2014-10-31 21:38:13 +00:00
George Mount
fa21e75734 Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev 2014-10-31 21:30:20 +00:00
Amith Yamasani
b9a7f37e71 am 84df64d4: am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev automerge: 80e5f45 
* commit '84df64d4009aa42ccca1bb4c4b03396fe441f990':
  Backup and restore battery saver trigger level
 2014-10-31 20:04:24 +00:00
Svetoslav
e7d267e3d8 am eaaa38ae: am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev automerge: 97fcd2b 
* commit 'eaaa38aea09e82fc557ebf0dd7fd02acfbfa1d59':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 20:04:14 +00:00
Amith Yamasani
84df64d400 am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 
automerge: 80e5f45

* commit '80e5f45979416c0bee487725eaf4078b6ba42769':
  Backup and restore battery saver trigger level
 2014-10-31 20:00:57 +00:00
Svetoslav
eaaa38aea0 am b1ecf0d7: Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 
automerge: 97fcd2b

* commit '97fcd2b5d15ed01b1ee27a30132e95b4733793cf':
  Adding APIs to enable apps to influence accessibility traversal.
 2014-10-31 19:58:57 +00:00
Amith Yamasani
8079a812aa Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev 2014-10-31 19:55:52 +00:00
Svetoslav
b1ecf0d776 Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev 2014-10-31 19:53:32 +00:00
Amith Yamasani
94005240ec Backup and restore battery saver trigger level 
Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
 2014-10-31 11:35:13 -07:00
Kenny Guy
48a69462cb am 6a7a24cc: am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev automerge: d305bf3 
* commit '6a7a24cc5ad073c6888d538b72a518a7cce79bde':
  Tidy up unused hidden methods in LauncherApps
 2014-10-31 13:02:57 +00:00
Kenny Guy
6a7a24cc5a am 88cfb428: Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 
automerge: d305bf3

* commit 'd305bf3dff7dcb1084aab5777818b4d96975268d':
  Tidy up unused hidden methods in LauncherApps
 2014-10-31 12:57:46 +00:00
Kenny Guy
88cfb428d4 Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev 2014-10-31 12:47:38 +00:00
Kenny Guy
dd6cb55b0e Tidy up unused hidden methods in LauncherApps 
Bug: 17483329
Change-Id: Ic4fbb180bafaa4d2c5ba332fe228c3d9baf4761c
 2014-10-31 11:23:12 +00:00
Sander Alewijnse
fc3ddf1107 am a1ceb929: am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit 'a1ceb92964612fca32bcd83e07b26e72994afca2':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:26:03 +00:00
Sander Alewijnse
a1ceb92964 am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
  Change javadoc of setAccountManagementDisabled.
 2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94 Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev 2014-10-31 10:05:36 +00:00
Alan Viverette
e7bcb1790a am e0e16794: am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit 'e0e16794afa38e00cdd5e0a9c2bd25700b77e15b':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:43:42 +00:00
George Mount
6ced4faf69 am 104257ba: am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit '104257bac6dfd677a2f0a36467d5a42eef27e597':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:43:37 +00:00
Alan Viverette
7bec21e627 am 1dfcd0cc: am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit '1dfcd0cc96d0cf50d81fe71101389a30e2bdbf2c':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:43:33 +00:00
Alan Viverette
e0e16794af am 19745dc0: am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit '19745dc0f1686dbcadd0107a18e4336ce2de2729':
  Only draw AbsListView selector when focused or pressed
 2014-10-31 00:38:56 +00:00
George Mount
104257bac6 am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-31 00:38:48 +00:00
Alan Viverette
1dfcd0cc96 am e1f9f231: am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit 'e1f9f2311035177a91dd568c7ec9a821a76b9e24':
  Fix inset check in ThreadedRenderer
 2014-10-31 00:38:39 +00:00
Craig Mautner
585b0c3dc1 am 6a80527f: am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '6a80527f617e603b3c4931ce88c7804d570de501':
  Add enter-animation-done callback for system windows
 2014-10-31 00:37:01 +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
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
 2014-10-31 00:29:52 +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
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
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