Alan Viverette
bc4bd10a04
am 6bea572d: am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
...
* commit '6bea572d9d85e4777ba351d574857495d2d7eeb2':
Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 21:17:37 +00:00
Jon Miranda
10ae043012
am 142b23ef: am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
...
* commit '142b23ef452c4ce06ce22c80b0e8c69c7c7eca11':
Adds support for Theme dumping via DDM.
2014-09-18 21:17:32 +00:00
John Reck
254f11cb3e
am 371ca2c0: am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
...
* commit '371ca2c04f30a2806469f1154a489353c8bc85fc':
Revert "Make starting window hw-accelerated"
2014-09-18 21:17:25 +00:00
Jeff Brown
d77d1e8284
am 47c0b6f4: am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit '47c0b6f402dca3166d58631916ce81fb489acac3':
Create an Application object for the system process.
2014-09-18 21:17:20 +00:00
Martijn Coenen
7cef882df9
am 76b77379: am 95bd8257: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '76b7737958d3fcf0520dd8c2c0486ecd7947ed79':
Upper-case incoming AIDs.
2014-09-18 21:17:05 +00:00
Alan Viverette
194206c4d7
am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
...
* commit 'c5073a812a82928ae681c9fcd328a3b1323b4edc':
Use action bar theme for action modes, fix ViewStub inflation theme
2014-09-18 20:57:26 +00:00
Jon Miranda
c5e711eeb2
am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev
...
* commit '1ae494deb79793c126e244c09ab9fd12a68df370':
Adds support for Theme dumping via DDM.
2014-09-18 20:57:19 +00:00
John Reck
7c48077877
am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
...
* commit 'a0f5d726fc8a5610e41c40e289fd107704202327':
Revert "Make starting window hw-accelerated"
2014-09-18 20:57:13 +00:00
Jeff Brown
116e069cdb
am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
...
* commit '6fc160ed30b6d194bbf824c5674403fc622b94f1':
Create an Application object for the system process.
2014-09-18 20:57:04 +00:00
Martijn Coenen
bc65b5cbdf
am 95bd8257: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev
...
* commit '95bd8257caa7d0cff6dfb06bec6d72361d4f6625':
Upper-case incoming AIDs.
2014-09-18 20:56:34 +00:00
Alan Viverette
07ecc748fb
Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev
2014-09-18 20:25:22 +00:00
Jon Miranda
3c7f018f42
Merge "Adds support for Theme dumping via DDM." into lmp-dev
2014-09-18 20:14:05 +00:00
John Reck
7e3d6c988c
Merge "Revert "Make starting window hw-accelerated"" into lmp-dev
2014-09-18 20:01:15 +00:00
Jeff Brown
2b5f91fe98
Merge "Create an Application object for the system process." into lmp-dev
2014-09-18 19:53:37 +00:00
John Reck
61375a8bb5
Revert "Make starting window hw-accelerated"
...
Bug: 17516789
This change corresponds to a sudden influx of bad surface crashes.
Reverting to see if stability returns as this was an optimization
CL
This reverts commit 29ff1bc57ac2c995c56f15ed6e56e5fb247b2a44.
Change-Id: I7835e89017161d94ad05fe46d81bd437c3dae3a7
2014-09-18 19:29:23 +00:00
Martijn Coenen
da6ffa06b7
Merge "Upper-case incoming AIDs." into lmp-dev
2014-09-18 18:52:57 +00:00
Jon Miranda
e82a4eeb40
Adds support for Theme dumping via DDM.
...
Bug: 17515415
Change-Id: Ice145a4b452177e36345cf2e071377bb7b3feeb3
2014-09-18 11:29:08 -07:00
George Mount
706ea6791b
am d05cfb4b: am 40dc25a2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev
...
* commit 'd05cfb4b211a9e936092ed768dc08c7e0bf0b99f':
Default to using hardware layer during fade transition.
2014-09-18 17:30:17 +00:00
George Mount
4024de450c
am 40dc25a2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev
...
* commit '40dc25a250f9f1ab7abcadae2d5e8700898a0e05':
Default to using hardware layer during fade transition.
2014-09-18 17:19:41 +00:00
George Mount
48af9ddbb6
Merge "Default to using hardware layer during fade transition." into lmp-dev
2014-09-18 16:56:46 +00:00
Sander Alewijnse
f8fce7cb86
am c027e8df: am a735243f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit 'c027e8dfd1452e80756cf8bd1e000c742d57e93b':
Update targetSdkVersion check.
2014-09-18 12:12:41 +00:00
Sander Alewijnse
549715d5fa
am a735243f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev
...
* commit 'a735243fba6ca4c0de7877831230d8c209882748':
Update targetSdkVersion check.
2014-09-18 12:00:22 +00:00
Sander Alewijnse
d4710c87e6
Merge "Update targetSdkVersion check." into lmp-dev
2014-09-18 11:36:19 +00:00
Adam Powell
072d122260
am 25c24378: am 0c5b7311: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
...
* commit '25c24378b3abd5da581ff0f28f5237df8d8918d3':
Fix UserManager#isUserAGoat
2014-09-18 05:07:22 +00:00
Adam Powell
8b69e5685d
am 0c5b7311: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
...
* commit '0c5b731108dd1842f618e9cc58f07368b731d1dc':
Fix UserManager#isUserAGoat
2014-09-18 04:46:12 +00:00
Alan Viverette
a9ddb8dc23
Use action bar theme for action modes, fix ViewStub inflation theme
...
BUG: 17262483
BUG: 17513621
Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
2014-09-17 18:14:32 -07:00
Adam Powell
988ae30ff7
Fix UserManager#isUserAGoat
...
Correctly detect if the user is a goat.
Change-Id: I78577dd7ec8c3685434ee03560010a6ea4db127f
2014-09-17 18:12:13 -07:00
Robert Greenwalt
4124ca96cd
am 010b4b12: am dbbe65ee: am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev
...
* commit '010b4b1292385876d1c3794bc41853172ecb789f':
Use unified Tethering Permission Check
2014-09-18 00:40:03 +00:00
Jeff Hao
7d0b3d445a
Deprecating InstructionCount.
...
Bug: 17489901
Change-Id: I554b9f3ce20adce55d6967d79d37d86b171b91c4
2014-09-17 17:27:03 -07:00
Robert Greenwalt
9231ff23e4
am dbbe65ee: am 50d23752: Merge "Use unified Tethering Permission Check" into lmp-dev
...
* commit 'dbbe65ee66eca553054cbdf967808963c9486dfe':
Use unified Tethering Permission Check
2014-09-18 00:24:24 +00:00
Robert Greenwalt
f3b47e95b1
Merge "Use unified Tethering Permission Check" into lmp-dev
2014-09-18 00:02:16 +00:00
Robert Greenwalt
edb47668f0
Use unified Tethering Permission Check
...
The BT and Wifi mechanisms for enabling Tethering did their own
permission checks. This set of changes unifies the check into
a ConnectivityManager function so they can be kept in sync.
bug:17435527
Change-Id: I8c157a5acf56ffbddd349cb6a45160ae7be8541b
2014-09-17 16:18:12 -07:00
George Mount
dc5bf6a7f0
Default to using hardware layer during fade transition.
...
Bug 17499864
When hasOverlappingRendering() is true, a layer is used to
to fade views because performance can be much worse then.
When hasOverlappingRendering() is false, the performance
is not hurt and a layer is not used.
Change-Id: If3fb1c23ffc8d0bef85c9d16df6c26ff4bbd49ac
2014-09-17 15:41:18 -07:00
Yigit Boyar
e32f0bea8e
am 1d119d3e: am 777f6c3c: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
...
* commit '1d119d3e47bf3157125b43fbfa376e824d7dce6b':
Handle action mode changes properly for actionbar tabs
2014-09-17 21:31:07 +00:00
Yigit Boyar
8424665e0e
am 777f6c3c: am 7fa36f26: Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
...
* commit '777f6c3c846a4a6722664cf119f6b8959b9db6f0':
Handle action mode changes properly for actionbar tabs
2014-09-17 21:22:02 +00:00
Jeff Brown
7fc8e357a4
Create an Application object for the system process.
...
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
2014-09-17 14:19:31 -07:00
Yigit Boyar
fd20f196b1
Merge "Handle action mode changes properly for actionbar tabs" into lmp-dev
2014-09-17 21:00:40 +00:00
Sandeep Siddhartha
7520d56a72
am 8a10e09d: am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
...
* commit '8a10e09df0bea79c0b74b8300e0588d703fbc378':
Fix issues with multiple languages and multi-users
2014-09-17 20:44:22 +00:00
Sandeep Siddhartha
67032ce76a
am 9364b830: am e80c6f17: Merge "Fix issues with multiple languages and multi-users" into lmp-dev
...
* commit '9364b830a4d78a3c76cc7eacc71c9b7808fd414b':
Fix issues with multiple languages and multi-users
2014-09-17 20:33:17 +00:00
Sandeep Siddhartha
80ea66b102
Merge "Fix issues with multiple languages and multi-users" into lmp-dev
2014-09-17 20:06:43 +00:00
Jeff Sharkey
6fe2e68ee0
am a71ad642: am 51420c63: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit 'a71ad642d2b2c5ab8c3087d2cb0bceb5821807db':
NetworkStats always needs arrays.
2014-09-17 19:37:25 +00:00
Jeff Sharkey
c86a48ffb9
am 51420c63: am bfd9a30f: Merge "NetworkStats always needs arrays." into lmp-dev
...
* commit '51420c63918de8db44084b04c155448c3fd25362':
NetworkStats always needs arrays.
2014-09-17 19:25:08 +00:00
Jeff Sharkey
9d375ecbe6
Merge "NetworkStats always needs arrays." into lmp-dev
2014-09-17 19:01:13 +00:00
Jeff Sharkey
7a8f1a32dc
NetworkStats always needs arrays.
...
Internal logic relies on Arrays.copyOf(), so always give ourselves
valid arrays, using shared empty objects to save overhead.
Bug: 17502649
Change-Id: I5dbb00545bdfe45bbd48144ab505ea08cc92cbcd
2014-09-17 09:26:31 -07:00
Yigit Boyar
2bbad0cddc
Handle action mode changes properly for actionbar tabs
...
Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b
2014-09-16 18:28:03 -07:00
Robert Greenwalt
a50af70303
am 7e17a28e: am 8fcbaddd: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit '7e17a28e26fe6020dedb3a5af6b5148c672d3d5a':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:34:32 +00:00
Robert Greenwalt
a70efa5036
am 8fcbaddd: am d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
...
* commit '8fcbaddd331b2b87698bc61c3bef0cdf439c31da':
Add NetworkAgent event for ExplicitlySelected
2014-09-17 00:23:08 +00:00
Adrian Roos
acfe969901
am ac017702: am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit 'ac017702c09d6d62c8fe1aea6500789727bcd99a':
Fix broken dispatch of onApplyWindowInsets
2014-09-17 00:20:57 +00:00
Brian Attwell
14b57f95ee
am d43a9ad3: am 942be889: am 56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
...
* commit 'd43a9ad3152ed994da7eff4a746bf7a2ef2bc5bf':
Pass different dy into dispatchNestedSCroll
2014-09-17 00:06:24 +00:00
Adrian Roos
571ca37d0f
am 3c782941: am 8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
...
* commit '3c782941ff6b684fe417c5c737e012342a778850':
Fix broken dispatch of onApplyWindowInsets
2014-09-17 00:06:21 +00:00