Aravind Akella
2f67bf3fef
am 43e0c717: am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev
...
* commit '43e0c7170454f1206b487071351ed676a926b3cd':
Step Counter documentation fix.
2014-08-21 03:33:10 +00:00
Julia Reynolds
b00889ddc2
resolved conflicts for merge of b259603d to master
...
Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04
2014-08-20 22:42:08 -04:00
Alan Viverette
68bf3c657a
am c29680bf: am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev
...
* commit 'c29680bf487a1a1460aca922555ecf76e6918193':
Use correct single-letter date format in SimpleMonthView
2014-08-21 00:57:29 +00:00
Mathieu Chartier
c2fa0fb19f
am a13e69f1: am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."
...
* commit 'a13e69f1ab0f03bb9afbe0578d1599d25d04aaf2':
Remove unnecessary explicit GC in ZygoteInit.
2014-08-21 00:51:05 +00:00
Aravind Akella
6c5b04a192
am da35d356: am b1762eb6: Merge "Step Counter documentation fix." into lmp-dev
...
* commit 'da35d3566292ada09172d8eb7b8e07828b49ee73':
Step Counter documentation fix.
2014-08-21 00:44:45 +00:00
Julia Reynolds
9d36917870
am 8da65466: am a6e05830: Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev
...
* commit '8da654665ea6c62359e99c9694de81ea1a2fe2ab':
Prevent profile owners from setting certain user restrictions.
2014-08-21 00:44:41 +00:00
Alan Viverette
5709934c71
am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev
...
* commit '28646cf6ab8f5837b44bed1393bce06d7ece508a':
Use correct single-letter date format in SimpleMonthView
2014-08-21 00:44:26 +00:00
Mathieu Chartier
41b07f1413
am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."
...
* commit '554bd8937b60e8f015f1f46b939dff92c2259790':
Remove unnecessary explicit GC in ZygoteInit.
2014-08-21 00:02:12 +00:00
Mathieu Chartier
554bd8937b
am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."
...
* commit '8f9ebc8a7c0238ce85104d2f20d0ddad1e4d8696':
Remove unnecessary explicit GC in ZygoteInit.
2014-08-20 23:49:12 +00:00
Adam Lesinski
88fd431b9b
am 5066ef8a: am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev
...
* commit '5066ef8a448a74619fa0083caf89eb3f925021cf':
Fix crash when launching Activities in 'android' package
2014-08-20 19:33:23 +00:00
Adam Lesinski
82340c87ea
am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev
...
* commit '7224e1b20c3f0be88ea8fc2daa9144cf68f091d9':
Fix crash when launching Activities in 'android' package
2014-08-20 19:26:03 +00:00
Chris Craik
aa0b5f1031
am d2affeca: am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev
...
* commit 'd2affecab253cd4e96a7b4c67fa2e38bc89df122':
Add outlineProvider attribute
2014-08-20 18:08:20 +00:00
Chris Craik
b9627eee5c
am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev
...
* commit 'c8028af9f90268db55547b56fd0dc242bb7d9053':
Add outlineProvider attribute
2014-08-20 17:59:56 +00:00
Mathieu Chartier
9a88f10b89
Remove unnecessary explicit GC in ZygoteInit.
...
Removes > 1s of GC time and hundreds of GC during device boot.
Zygote size before: 8388608
Zygote size after: 8388608
No increase in zygote space size due to zygote compaction.
Bug: 16398684
Change-Id: I3c6f5a0b26a207ab39bb0a952400d7488e42f00c
2014-08-20 10:57:45 -07:00
Aravind Akella
be2ecae5fe
Merge "Step Counter documentation fix." into lmp-dev
2014-08-20 16:06:26 +00:00
Amith Yamasani
7511526792
resolved conflicts for merge of 83726dfc to master
...
Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98
2014-08-20 08:41:02 -07:00
Amith Yamasani
47cf74f8e0
am c233686a: am ed084f44: Merge "Rename restrictions API class and method" into lmp-dev
...
* commit 'c233686adbcebbd51d06b5efeeb8192567b48597':
Rename restrictions API class and method
2014-08-20 15:22:40 +00:00
Selim Cinek
522cb106dc
am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications
...
* commit '65dbc32814ed265a0c1adcd4100f80029402ef40':
Added notification color to all system notifications
2014-08-20 13:59:14 +00:00
Selim Cinek
d3c833fc97
am 53006cab: am cc19946d: Added notification color to all system notifications
...
* commit '53006cab63fed5d176c5d97d4fc1807192ae9c4d':
Added notification color to all system notifications
2014-08-20 13:52:14 +00:00
Selim Cinek
255dd04271
Added notification color to all system notifications
...
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Jinsuk Kim
e63ab3c237
am 8d27c053: am 7747bf8d: am d1cd4053: Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev
...
* commit '8d27c0534cb27c17ecae4681c7c0aa897eb474f4':
CEC: Hook up device select API to MHL device RAP
2014-08-20 05:56:17 +00:00
Jinsuk Kim
8b9ac4efb4
am 7747bf8d: am d1cd4053: Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev
...
* commit '7747bf8df1ae82f7e15639870b7f984d2a25b8eb':
CEC: Hook up device select API to MHL device RAP
2014-08-20 05:49:23 +00:00
Jeff Brown
961ccb13bc
am 012ddc53: am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev
...
* commit '012ddc53f7da5c50606e689cb6a7d87779076739':
Remove incomplete media router API. (DO NOT MERGE)
2014-08-20 03:26:50 +00:00
Adam Powell
bac934ab43
am 613f664a: am 04fd54d4: am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev
...
* commit '613f664a67ff2d30a567ca5e999490bf920ccb80':
Update text selection handles to have a minimum touch target size.
2014-08-20 03:19:07 +00:00
Adam Powell
6240d0bc3f
am 04fd54d4: am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev
...
* commit '04fd54d4c543e6516fb2bfd823f53e376e97197d':
Update text selection handles to have a minimum touch target size.
2014-08-20 03:10:42 +00:00
Aravind Akella
0c44d69dc5
Step Counter documentation fix.
...
Change-Id: I04921ca2bdfd10581f5582a025de617a506035b7
2014-08-19 18:28:12 -07:00
Alan Viverette
1fd0406a29
am 57be5a2c: am e330a384: am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev
...
* commit '57be5a2cce2d2d11f841d1d1d73fc1defa71265a':
Draw accessibility focus in View rather than ViewRootImpl
2014-08-20 00:14:09 +00:00
Alan Viverette
c9b499b4e9
am e330a384: am 44b61fde: Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev
...
* commit 'e330a384a067f95ed1e89d83f82ea848301040f7':
Draw accessibility focus in View rather than ViewRootImpl
2014-08-20 00:05:47 +00:00
Igor Murashkin
99a7903f0c
am 5e9121eb: am bdf49aa1: am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev
...
* commit '5e9121eb1e10fec5f38e8f27707f996b5af6630c':
camera2: legacy: disable shutter sounds unconditionally via camera2 api
2014-08-19 23:52:49 +00:00
Alan Viverette
86645bb0f8
am b50a3a2c: am 0118f49a: am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev
...
* commit 'b50a3a2c382739c91eafc8b2a0cc6087f7a9cce8':
Fix alignParentRight/End in RelativeLayout
2014-08-19 23:52:42 +00:00
George Mount
9eff8e6349
am e50674fb: am 31894079: am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev
...
* commit 'e50674fb67d6a5ec836f233188277e4d2b61a684':
Fixed ChangeBounds matching against the wrong View.
2014-08-19 23:52:37 +00:00
Igor Murashkin
c88cf74d40
am bdf49aa1: am 1a054ea8: Merge "camera2: legacy: disable shutter sounds unconditionally via camera2 api" into lmp-dev
...
* commit 'bdf49aa1211d87c4c25571d70a5669e1622318ba':
camera2: legacy: disable shutter sounds unconditionally via camera2 api
2014-08-19 23:44:34 +00:00
Alan Viverette
3ae3e02022
am 0118f49a: am 7617ae5f: Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev
...
* commit '0118f49a9edf5a0f64a3967539f9c3a474cd0db7':
Fix alignParentRight/End in RelativeLayout
2014-08-19 23:44:21 +00:00
George Mount
914e2cc89a
am 31894079: am 273f568d: Merge "Fixed ChangeBounds matching against the wrong View." into lmp-dev
...
* commit '3189407931c46c4440ff040f494e8f027e771812':
Fixed ChangeBounds matching against the wrong View.
2014-08-19 23:44:16 +00:00
Alan Viverette
aff1efa622
Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev
2014-08-19 22:53:25 +00:00
Alan Viverette
fd2dd208d9
Use correct single-letter date format in SimpleMonthView
...
Also fixes layout on sw600dp-land (by removing the sw600dp layout!).
BUG: 17068298
Change-Id: I2545d0e1904a0028156b96b6ad17674c6107ce5d
2014-08-19 18:11:54 -07:00
Chris Craik
e2527bc206
Merge "Add outlineProvider attribute" into lmp-dev
2014-08-19 22:53:25 +00:00
Chris Craik
f56885d413
Add outlineProvider attribute
...
bug:16871683
Change-Id: Iae9326c41872ac03d40ebeec6257522a34cbe1ff
2014-08-19 18:04:14 -07:00
Amith Yamasani
609aaca4d8
Merge "Rename restrictions API class and method" into lmp-dev
2014-08-19 22:53:25 +00:00
Amith Yamasani
d1d7c022c6
Rename restrictions API class and method
...
AbstractRestrictionsProvider -> android.service.restrictions.RestrictionsReceiver
requestPermission->onRequestPermission
Bug: 17006805
Change-Id: I03b1626d6abcd2ad739a55b60b54fdbf9810ceca
2014-08-19 17:03:41 -07:00
Alan Viverette
7622f46c78
Merge "Draw accessibility focus in View rather than ViewRootImpl" into lmp-dev
2014-08-19 21:23:09 +00:00
Alan Viverette
54509d5a68
Merge "Fix alignParentRight/End in RelativeLayout" into lmp-dev
2014-08-19 21:23:09 +00:00
Alan Viverette
567e44797b
Fix alignParentRight/End in RelativeLayout
...
BUG: 17136816
Change-Id: If7edb2e0216384429f4caf7e9aae01c09ddd8be4
2014-08-19 15:41:51 -07:00
George Mount
4d1ecf5daf
Fixed ChangeBounds matching against the wrong View.
...
ChangeBounds must ensure that its parents match to use reparent,
but it used instance and ID matching. Matching can now be
done in several ways and that is insufficient.
Change-Id: Ic0432cd06549e4dc9ba49f33b0a6a42082e29dc1
2014-08-19 14:39:47 -07:00
Adam Lesinski
cad5c64fff
am 1ed46f56: am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
...
* commit '1ed46f56df69f8e4749efbb407b2d81c2972ca9f':
Add Shell command to set AppOps permissions
2014-08-19 21:19:35 +00:00
Adam Lesinski
7c97b74a05
am 1f5eb661: am 960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
...
* commit '1f5eb661b38dee97c65ddfb7a7dc720afbcca3bb':
Add Shell command to set AppOps permissions
2014-08-19 21:08:01 +00:00
Alan Viverette
997aa40645
Draw accessibility focus in View rather than ViewRootImpl
...
This ensures that the focus rect position is correct when running in
render thread accelerated mode. Also adds a missing call to draw the
overlay.
BUG: 16796647
BUG: 17063342
Change-Id: I377e5eaea89d3f20c8c7e82c264a0f106021d58b
2014-08-19 20:36:07 +00:00
George Mount
4e9ff828f5
am 8913ac21: am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev
...
* commit '8913ac21578c0bcf62e2281da95d56f8ef0b39d8':
Set start transform before animator starts.
2014-08-19 20:13:53 +00:00
George Mount
ed526817bc
am cc3e585f: am 793b08cd: Merge "Set start transform before animator starts." into lmp-dev
...
* commit 'cc3e585f57ff509531f19e3dc361e9c89177ff60':
Set start transform before animator starts.
2014-08-19 20:05:52 +00:00
Lorenzo Colitti
aa740d3fdc
am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
...
* commit '5eb792fcdebc92a872c17a54310db3de60e7d620':
Stop using LinkProperties for static configuration.
2014-08-19 19:49:10 +00:00