drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,480 Commits 1 Branch 0 Tags
Commit Graph

58415 Commits

Author SHA1 Message Date
Alan Viverette
15d3a53be5 am 721fc2ad: Fix build 
* commit '721fc2adf4d4d5b890b12cb2067db10e78888aba':
  Fix build
 2014-10-17 18:50:41 +00:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00
Alan Viverette
0087f2253a am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '2f68a204b2299029dd492ab25bd3bcfe7216bafc':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:23:20 +00:00
Alan Viverette
2f68a204b2 Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 2014-10-17 17:18:36 +00:00
Dianne Hackborn
56ae044791 am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit '686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5':
  Add API level for MR1.
 2014-10-17 17:15:29 +00:00
Dianne Hackborn
686a41ef2b Merge "Add API level for MR1." into lmp-mr1-dev 2014-10-17 17:12:01 +00:00
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -07:00
Alan Viverette
e0fceba162 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 
automerge: 0db6536

* commit '0db6536190fa34910c0bfe376c47b8d594f32a25':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:00:30 +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
2e8beaed54 am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '06819409c673b6f93c1df9f7d6949f623ff67192':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:39:51 +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
fe6cde379a am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '6580c273a51daee08972149f2d2ede8ef6e7a79a':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:56:33 +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
c344cdc1bb am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'ccb7a9af271836fde98636d9ce6ebbda09eb0158':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 14:56:40 +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
27a08f2ad5 am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit 'ea6f0ae86d62cff88d63b926578c588a956d0512':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:25:45 +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
Eric Rowe
1e684b3ded am ea626e1a: am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'ea626e1af8019786d514d3de0b8a1fa274ca424c':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 06:49:34 +00:00
Eric Rowe
ea626e1af8 am de96b966: am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit 'de96b966fb6c8e0694f3a94fc0f42d64090d4fa0':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-16 05:51:52 +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
ca66be9e0e am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'b4a29247ffb58f44e50edad7cf56ffc2ea0d7c6b':
  Set content description on CalendarView day labels
 2014-10-16 01:21:32 +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
c07241cab3 am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev 
* commit '0511023432ff24c5ddda563e326273936b5d40f5':
  Document Toolbar's vertical alignment strategy
 2014-10-16 00:52:29 +00:00
Alan Viverette
205a5e69cc am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '8afc90fd715457033ca70dae3cd53377957d8b94':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 00:52:24 +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
f8c7d87a65 am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit '19c0a1632f3be67c8cbbee210cd6d8eedfe3649a':
  View measurement optimization
 2014-10-16 00:28:16 +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
Eric Rowe
de96b966fb am 1b4a728a: Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 
* commit '1b4a728ac689fc63b5b5153e95b8b634f701fcfb':
  Add CHANGE_NETWORK_STATE permission to bt tests
 2014-10-15 23:40:40 +00:00
Libin.Tang@motorola.com
4798bca274 am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit '0499bb5de45cf5542db7ac42406cd856d3386f1f':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-15 23:32:52 +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
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE 
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
 2014-10-15 15:19:49 -07:00
Geoff Mendal
ae3010b5ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-15 22:16:36 +00:00
Geoff Mendal
95d6d8c585 Import translations. DO NOT MERGE 
Change-Id: Ia14afe9895bf88d66edcadaed7885994c3a2a846
Auto-generated-cl: translation import
 2014-10-15 15:09:43 -07:00
Geoff Mendal
512c2330c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-15 22:02:00 +00:00
Geoff Mendal
718ba70f6e Import translations. DO NOT MERGE 
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
 2014-10-15 14:59:09 -07:00
Geoff Mendal
e2a1f1cd88 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-15 21:52:24 +00:00
Geoff Mendal
89b5580b81 Import translations. DO NOT MERGE 
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
 2014-10-15 14:37:19 -07:00
Eric Rowe
1b4a728ac6 Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 2014-10-15 21:35:32 +00:00
Alan Viverette
ef71947fd3 Set content description on CalendarView day labels 
BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
 2014-10-15 14:16:41 -07:00
Eric Rowe
500f7583ed Add CHANGE_NETWORK_STATE permission to bt tests 
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
 2014-10-15 14:06:30 -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
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