Neil Fuller
a762f687eb
am 3b96bfb1: am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit '3b96bfb1034433fde57239de036eaa96be107f04':
Removing some more FloatMath references
2014-10-17 15:04:34 +00:00
Neil Fuller
3b96bfb103
am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
Removing some more FloatMath references
2014-10-17 14:59:48 +00:00
Neil Fuller
9b0109eb05
am c7aa8fe6: Merge "Removing some more FloatMath references"
...
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
Removing some more FloatMath references
2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623
Merge "Removing some more FloatMath references"
2014-10-17 14:48:17 +00:00
Alan Viverette
6658034c91
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 automerge: e0fceba
...
automerge: 777949c
* commit '777949c64d335fd56eef80eadc2b09dcb5e009fa':
Update AM/PM selectors for clock face TimePicker
2014-10-17 00:51:15 +00:00
Alan Viverette
777949c64d
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536
...
automerge: e0fceba
* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
Update AM/PM selectors for clock face TimePicker
2014-10-17 00:15:02 +00:00
Alan Viverette
0db6536190
Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev
2014-10-16 23:48:38 +00:00
Prerepa Viswanadham
41ae22f5d0
am 1724f211: am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '1724f211608f13883d76c62d5c4d851c27781ae3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:54:56 +00:00
Prerepa Viswanadham
1724f21160
am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '2e8beaed54aa897eb4b9435ab11d269f15266f4a':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:45:28 +00:00
Prerepa Viswanadham
06819409c6
am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 18:35:33 +00:00
Brian Carlstrom
c12099678f
am 70111a42: am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit '70111a429d6da51ffd1790eb767086acada2dabe':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 18:12:59 +00:00
Brian Carlstrom
70111a429d
am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'fe6cde379a7b086032877917c0ee0e64bf7e9e57':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 18:05:13 +00:00
Brian Carlstrom
6580c273a5
am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 17:45:54 +00:00
Prerepa Viswanadham
56302744c4
am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()
...
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96
Update javadoc comments for getBluetoothLeAdvertiser()
...
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities
bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
2014-10-16 16:06:44 +00:00
George Mount
e084c1f1e5
am 56789daa: am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit '56789daadf666a24c4644cd3820561566582109f':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:35:30 +00:00
George Mount
56789daadf
am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:29:51 +00:00
George Mount
ea6f0ae86d
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
2014-10-16 14:21:43 +00:00
Neil Fuller
d44e9f9ed7
am 06965cfd: am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit '06965cfd12854d8b1f783a847d4b979100da4551':
Replacing FloatMath native implementation with calls to Math
2014-10-16 09:41:00 +00:00
Neil Fuller
06965cfd12
am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
Replacing FloatMath native implementation with calls to Math
2014-10-16 09:35:43 +00:00
Neil Fuller
8a3785cafe
am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit 'fd2d41b742339d278f4a66f78a7c161108985ed8':
Replacing FloatMath native implementation with calls to Math
2014-10-16 09:24:18 +00:00
Neil Fuller
fd2d41b742
Merge "Replacing FloatMath native implementation with calls to Math"
2014-10-16 08:16:24 +00:00
Alan Viverette
d0d6775ef6
am bba4bcf0: am ca66be9e: am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
...
* commit 'bba4bcf0b15f3675d07373919eb23027a94949c9':
Set content description on CalendarView day labels
2014-10-16 02:48:18 +00:00
Alan Viverette
bba4bcf0b1
am ca66be9e: am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
...
* commit 'ca66be9e0ef691a4c8ccd5c7da7e07e618e9bb85':
Set content description on CalendarView day labels
2014-10-16 02:37:32 +00:00
Brian Carlstrom
d2b824887f
am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 01:56:00 +00:00
Alan Viverette
a9a8ba2c6e
am e3171d27: am c07241ca: am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev
...
* commit 'e3171d276272a8ae098a50cbcac691d3c8b62dab':
Document Toolbar's vertical alignment strategy
2014-10-16 01:19:37 +00:00
Alan Viverette
3c72e618cc
am 6950153f: am 205a5e69: am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
...
* commit '6950153f95fe7ebeddc1d6ed683fd596f8364f1f':
Add style support to PopupMenu, clean up constructor javadoc
2014-10-16 01:19:30 +00:00
Alan Viverette
b4a29247ff
Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
2014-10-16 01:07:04 +00:00
Brian Carlstrom
20de619d66
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
2014-10-16 01:01:26 +00:00
Alan Viverette
e3171d2762
am c07241ca: am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev
...
* commit 'c07241cab3aa3f2fdc7b39a37861c22f245bd8f1':
Document Toolbar's vertical alignment strategy
2014-10-16 00:57:09 +00:00
Alan Viverette
6950153f95
am 205a5e69: am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
...
* commit '205a5e69cc7f2cf30202cf1e122670aac254e5f1':
Add style support to PopupMenu, clean up constructor javadoc
2014-10-16 00:57:03 +00:00
Alan Viverette
0511023432
Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev
2014-10-16 00:46:24 +00:00
Alan Viverette
8afc90fd71
Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
2014-10-16 00:44:36 +00:00
Adam Powell
aa2e0fd9fd
am c928beac: am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev
...
* commit 'c928beac470156dfb22a993a3a7ea0c4f3f2bd10':
View measurement optimization
2014-10-16 00:37:19 +00:00
Adam Powell
c928beac47
am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev
...
* commit 'f8c7d87a65f7a94201d7aa3c7ff3f474b83f43db':
View measurement optimization
2014-10-16 00:32:14 +00:00
Adam Powell
19c0a1632f
Merge "View measurement optimization" into lmp-mr1-dev
2014-10-16 00:21:29 +00:00
Alan Viverette
29632521c3
Add style support to PopupMenu, clean up constructor javadoc
...
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
2014-10-15 17:19:30 -07:00
Libin.Tang@motorola.com
0841572b99
am c2814749: am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.
...
* commit 'c28147490a0f7c5cceaaa4d0746ffa0d4842e8b6':
IMS:change enhanced 4g setting to store in setting db.
2014-10-16 00:06:30 +00:00
Libin.Tang@motorola.com
c28147490a
am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.
...
* commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b':
IMS:change enhanced 4g setting to store in setting db.
2014-10-15 23:56:23 +00:00
George Mount
7c479f5a01
Use empty snapshots list when there are no shared elements.
...
Bug 17964119
Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
2014-10-15 16:21:51 -07:00
Libin.Tang@motorola.com
0499bb5de4
IMS:change enhanced 4g setting to store in setting db.
...
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
2014-10-15 16:12:39 -07:00
Alan Viverette
ef71947fd3
Set content description on CalendarView day labels
...
BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
2014-10-15 14:16:41 -07:00
Alan Viverette
67945c11a5
Update AM/PM selectors for clock face TimePicker
...
The selectors are now CheckedTextViews, which makes more sense when
using a screen reader.
BUG: 17468036
Change-Id: I09c62a08172a710faa8fb7ed2bf99a66331e5701
2014-10-15 13:20:54 -07:00
Adam Powell
9cefbda11e
View measurement optimization
...
If a view hasn't explicitly requested layout and it's asked to measure
with MeasureSpec.EXACTLY in both dimensions and sizes that match its
current measured size, the measure operation is a no-op.
This helps out a number of ViewGroups that perform initial speculative
measurements with AT_MOST or UNSPECIFIED followed by looping over
child views and measuring EXACTLY to lock in the final measurement
with perhaps some extra leftover space distributed. In practice this
happens a fair bit, especially for views high up in the view
hierarchy. This optimization allows ViewGroup measurement code to be a
little cleaner in not having to keep track of this on its own.
Change-Id: I88ff46a7d37aeda7a4cd16204b68cab0d051b341
2014-10-15 12:20:36 -07:00
Jim Miller
97f66f6754
am 26e4de2f: am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '26e4de2ff11c6e055a163fe20249e7f202629cb3':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:46:00 +00:00
Jim Miller
26e4de2ff1
am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '1a02efb1247569ae0e133c199295c873e4ad9b52':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:40:08 +00:00
Jim Miller
ce711c6d57
am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f
am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
...
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
Add a checkbox option to 'require password to decrypt'
2014-10-15 18:26:59 +00:00
Jim Miller
e7c325559d
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
2014-10-15 18:21:52 +00:00
Amith Yamasani
8d0c97af73
am 2df0ce5e: am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '2df0ce5e2b73900452b8a1841938d3407469af41':
Fix admin policies in managed profiles
2014-10-15 18:16:54 +00:00