Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,493 Commits 3 Branches 0 Tags
24228295e23ca60040d9b5ffa5491f1d2fc64fb7
Commit Graph

44063 Commits

Author SHA1 Message Date
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master. 
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
 2014-11-20 17:27:36 -08:00
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00
George Mount
d3a6338cfb am b986f82c: am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev automerge: bf50b88 
* commit 'b986f82cff447fa7f76796d03f210cbfb48291ab':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:34:31 +00:00
George Mount
6bc03efd12 am e8a4055a: am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev automerge: b883579 
* commit 'e8a4055a0910538ec9b4c2959d3bbdf8d7ef6fc1':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:34:20 +00:00
George Mount
b986f82cff am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
automerge: bf50b88

* commit 'bf50b88ed70c2f34b2426ce80213698e46d09eb0':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:28:33 +00:00
George Mount
e8a4055a09 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
automerge: b883579

* commit 'b8835791e2d2fab41277597008010a5681dacb41':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:27:17 +00:00
Chet Haase
ab11cfa2d3 am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8 
* commit 'a2b3a75ca599c3a2334b9c81a5abd6f544615d2f':
  Fix seeking and scaled duration behavior
 2014-11-20 21:19:27 +00:00
Alan Viverette
8c359de059 am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06 
* commit '8ee7fcd28bf54a4cc3d89a08bf48508d9a82cc58':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:19:17 +00:00
Alan Viverette
51c1803c2b am ee53586a: am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev automerge: 6a6b828 
* commit 'ee53586acb0e4b64d25313ccbab7e9310cdd9e2c':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:19:12 +00:00
Chet Haase
a2b3a75ca5 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
automerge: a79d2e8

* commit 'a79d2e86649dfb96159c2aebd94b4a5e19d66eb1':
  Fix seeking and scaled duration behavior
 2014-11-20 21:13:10 +00:00
Alan Viverette
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:10:56 +00:00
Alan Viverette
ee53586acb am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
automerge: 6a6b828

* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:09:34 +00:00
Chris Craik
57b641a2ed am 3b2ba44b: Merge "Improve logging around performance critical events" into lmp-mr1-dev 
* commit '3b2ba44be3699a4e133d7a09cb4ed182405d7ff9':
  Improve logging around performance critical events
 2014-11-20 17:50:20 +00:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
George Mount
bf50b88ed7 am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
* commit '419754545ea0768a7fa715daddedef75b7b31bfa':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 15:33:13 +00:00
George Mount
419754545e Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 2014-11-20 15:29:26 +00:00
George Mount
b8835791e2 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
* commit '485ac7782ed7605507bf2186246f59c537f8b578':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 15:27:38 +00:00
George Mount
485ac7782e Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 2014-11-20 15:23:55 +00:00
Chris Craik
70850ea258 Improve logging around performance critical events 
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
 2014-11-19 17:24:30 -08:00
George Mount
6c211ff43e Reset the transitionAlpha after the transition completes. 
Bug 18423893

Change-Id: I2ea30c3b7c45eca70d1518e73f814b827f519fa0
 2014-11-19 16:39:16 -08:00
Chet Haase
a79d2e8664 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
* commit '85603a7faf0a8067803ae6424bc590f6e2a17e07':
  Fix seeking and scaled duration behavior
 2014-11-20 00:07:50 +00:00
Chet Haase
85603a7faf Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 2014-11-20 00:02:09 +00:00
Alan Viverette
4247f06ba4 am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
* commit 'b130d5961cb154e8821cfa42fdd820d67497d84d':
  Remove underline and search icon from ActionBar search view
 2014-11-19 23:57:42 +00:00
Alan Viverette
6a6b828090 am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
* commit '552eca1a713ab8f6c60d6ec0d350ef33813cd25b':
  Implement Material-style delegate for CalendarView
 2014-11-19 23:53:25 +00:00
Alan Viverette
b130d5961c Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 2014-11-19 23:52:24 +00:00
Alan Viverette
552eca1a71 Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 2014-11-19 23:51:34 +00:00
Raph Levien
93e48e8cf1 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-19 15:39:34 -08:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior 
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
 2014-11-19 15:29:47 -08:00
George Mount
2db3bf5c49 Slide supports Gravity.START and Gravity.END. 
Bug 18444396

Change-Id: Id7b82b44948e4501c2b4fb5302d22672fa20cd00
 2014-11-19 14:14:53 -08:00
Amit Mahajan
5ed01f6427 am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 18:05:33 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
Nicolas Prevot
97166e0790 am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '9b07760dbcc19f47b9ee02081b26a9bbc2a40157':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:08:38 +00:00
Nicolas Prevot
9b07760dbc am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:01:51 +00:00
Nicolas Prevot
439f17e622 am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 09:55:44 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Alan Viverette
67fd871bc5 am ea3219ff: am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'ea3219ffa9a6b23f6a2bbcbbe6f6ca83490eadad':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:48:41 +00:00
Alan Viverette
ea3219ffa9 am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit '4be155e81aae4fe1354ebc5abe9d55c33723fa4f':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:42:06 +00:00
Alan Viverette
4be155e81a am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'a489f0b3d9007d94ba514bf4ce71ce9957147e33':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:34:59 +00:00
Alan Viverette
a489f0b3d9 Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 2014-11-19 02:28:37 +00:00
Alan Viverette
448ff718a0 Re-initialize data when changing time picker 24-hour mode 
BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
 2014-11-18 18:28:04 -08:00
Amit Mahajan
4fea0923be Adding new setting LTE_SERVICE_FORCED. 
Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
 2014-11-18 17:34:36 -08:00
Alan Viverette
cb8ed3705c Remove underline and search icon from ActionBar search view 
BUG: 17396265
Change-Id: I751bc79538f1ea412192172035920e59351270f1
 2014-11-18 17:05:35 -08:00
Andreas Gampe
668e3b44b8 am 2cabf4a9: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
* commit '2cabf4a93df38569e8fd70ac6c848e9e96113116':
  PopupWindow: fix typo in doc comment
 2014-11-19 00:24:23 +00:00
Rubin Xu
4221126b95 am 3c1d5e2f: am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '3c1d5e2f9d0724f0a10313244d0ef47957d855f2':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:24:13 +00:00
Chris Craik
22da9ba481 am 51888ef8: am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '51888ef85d1350217297cb704dac80d45a1845e9':
  Update clipToPadding docs
 2014-11-19 00:24:04 +00:00
Andreas Gampe
2cabf4a93d Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-19 00:20:49 +00:00
Rubin Xu
3c1d5e2f9d am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:19:50 +00:00
Chris Craik
51888ef85d am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit 'df57b22bc679664138079a4f15966b19f63f0aea':
  Update clipToPadding docs
 2014-11-19 00:19:34 +00:00