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
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
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
Adrian Roos
0f08243da6
am c344cdc1: am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
...
* commit 'c344cdc1bbe6dca60326b6d4f10a67a923c84847':
Prevent ChooserActivity from taking over the system bars
2014-10-16 15:01:36 +00:00
Adrian Roos
ccb7a9af27
Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
2014-10-16 14:54:19 +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
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
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
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
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
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
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
2df0ce5e2b
am ecb7b899: am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit 'ecb7b899b022d2ecbee48324c1e4a524a596a29e':
Fix admin policies in managed profiles
2014-10-15 18:12:10 +00:00
Amith Yamasani
5c8cafa614
am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
Fix admin policies in managed profiles
2014-10-15 17:54:34 +00:00
Amith Yamasani
01ddc75fc1
am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
...
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
Fix admin policies in managed profiles
2014-10-15 17:49:19 +00:00
Amith Yamasani
2c3886cb34
Merge "Fix admin policies in managed profiles" into lmp-dev
2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259
Fix admin policies in managed profiles
...
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.
Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.
Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.
Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.
Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
2014-10-15 10:42:17 -07:00
Jeff Sharkey
e6ba73e07b
am fbfd900a: am 2df76285: am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit 'fbfd900aa8a4721ce3ef84f5d08b5ecd67f16fd8':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 17:10:38 +00:00
Jeff Sharkey
2df7628591
am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit '203ed4db9656cc3047c65e12e3969d21652d4ccf':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:58:49 +00:00
Jeff Sharkey
203ed4db96
am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
...
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:09 +00:00
Jeff Sharkey
97d47ed036
Reduce PackageInstaller Binder memory pressure.
...
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions. To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.
Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
2014-10-15 09:19:54 -07:00
Neil Fuller
8ee062122f
am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"
...
* commit '1802567a79b2fc94aa1dff387cd55db8521cdca6':
Fix Time docs to document various error cases
2014-10-15 16:05:55 +00:00
Neil Fuller
1802567a79
am e4625cc1: Merge "Fix Time docs to document various error cases"
...
* commit 'e4625cc1a861615f4b3447e2a4d4990590d51470':
Fix Time docs to document various error cases
2014-10-15 16:01:01 +00:00
Neil Fuller
e4625cc1a8
Merge "Fix Time docs to document various error cases"
2014-10-15 15:56:06 +00:00
Adrian Roos
27c3ab630a
Prevent ChooserActivity from taking over the system bars
...
Bug: 17939334
Change-Id: I4d028695a1f81442cbbe7067b33475634effd5d2
2014-10-15 17:22:27 +02:00
Neil Fuller
7079f2003c
Fix Time docs to document various error cases
...
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
2014-10-15 12:08:05 +01:00