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

150244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dongwon Kang
2a9af92880 am 7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 
* commit '7c2ae2177f1163a80822535adbf013edeb615ad2':
  TIF: verify the hardware input ID from getHardwareInputId().
 2014-08-19 04:10:41 +00:00
Jon Miranda
16adbb4222 am 4a5ac7db: am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit '4a5ac7db49117b5d14e82caca68405949eccfec5':
  Exposes style and theme data, adds developer option.
 2014-08-19 03:10:22 +00:00
Jon Miranda
19d65ad016 am b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev 
* commit 'b315ca55a9da8857ebe15547f59b333891cf7ed4':
  Exposes style and theme data, adds developer option.
 2014-08-19 02:58:25 +00:00
Chris Craik
2262abbd16 Respect round rect clip when determining op opaqueness 
bug:17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab
 2014-08-18 19:55:36 -07:00
Jungshik Jang
59b9c3f75a am 4e8baac5: am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 
* commit '4e8baac5e77a54737bfad8180bc8ee832adf4b74':
  Remove parameter field in HdmiCecKeycode.
 2014-08-19 02:54:52 +00:00
Igor Murashkin
3a6eba01c4 Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
517b74533a camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader 
Return empty array since no implementation-defined sizes are supported

Bug: 17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
 2014-08-19 10:51:30 -07:00
Igor Murashkin
ae0da7a81c Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev 2014-08-19 02:43:23 +00:00
Igor Murashkin
981952d07a camera2: (Legacy) Add control.sceneMode = DISABLED to templates 
Bug: 17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
 2014-08-19 11:04:31 -07:00
Jungshik Jang
a70c0c6220 am d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 
* commit 'd9910efb19df1b7aaebfc21d9f74977159d1b9f0':
  Remove parameter field in HdmiCecKeycode.
 2014-08-19 02:33:49 +00:00
Dongwon Kang
79fc32794c Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev 2014-08-19 02:08:36 +00:00
Dianne Hackborn
f55e9310af am 59fef76d: am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev 
* commit '59fef76d149b05fe6886a223c36e662e6c47d41b':
  Fix issue #17114392: android.com.phone crashes - PackageManager code
 2014-08-19 01:41:19 +00:00
Ji-Hwan Lee
7a3e25d085 am ca1aebdf: am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 
* commit 'ca1aebdf0c09a47e19c0526cd54fea07cdc8454f':
  TIF: Remove session state when hardware wrapper input crashes
 2014-08-19 01:41:08 +00:00
Dianne Hackborn
84c9e03543 am 0dafd7dc: Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev 
* commit '0dafd7dceccde18aaa9eac05c77d035df979d88f':
  Fix issue #17114392: android.com.phone crashes - PackageManager code
 2014-08-19 01:25:41 +00:00
Ji-Hwan Lee
3812cc0e69 am 16b1d44e: Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 
* commit '16b1d44eea546f0ac4144f8cfbb847f9b880bfb6':
  TIF: Remove session state when hardware wrapper input crashes
 2014-08-19 01:16:21 +00:00
Dianne Hackborn
178eea5547 am 900eb151: am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 
* commit '900eb15179fa1cbf58231715c9af3f65115631c1':
  Temporary: raise overflow limit, print all wake locks.
 2014-08-19 01:03:04 +00:00
Dianne Hackborn
40c6841294 am 8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 
* commit '8c1c48751db6c82826050f2bdde4c98c1aec8cd6':
  Temporary: raise overflow limit, print all wake locks.
 2014-08-19 00:52:53 +00:00
Michael Wright
15253d0aea am 9df4c42a: am e835a130: Merge "Persist Show IME option." into lmp-dev 
* commit '9df4c42aaada081a128671f2a3f6e06a5effa5cc':
  Persist Show IME option.
 2014-08-19 00:48:56 +00:00
Michael Wright
37869daf5e am 0cddd377: am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev 
* commit '0cddd377c9976b091457118a9a81b4a405958c2e':
  Update MenuItem#setShortcut docs
 2014-08-19 00:48:51 +00:00
Michael Wright
4981b00356 am e835a130: Merge "Persist Show IME option." into lmp-dev 
* commit 'e835a1305ff2b493f9488125c17314ff7bf34c22':
  Persist Show IME option.
 2014-08-19 00:41:10 +00:00
Michael Wright
fa206fb7b3 am 4bbb811f: am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 
* commit '4bbb811f0139849a7f0a9a0bc4cbc45daccf4d12':
  Add callbacks for MediaProjection start / stop.
 2014-08-19 00:41:06 +00:00
Michael Wright
89c001db3d am 6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev 
* commit '6e1edc12a27ab92cd47ccdd588982ee629c0ae97':
  Update MenuItem#setShortcut docs
 2014-08-19 00:41:04 +00:00
Michael Wright
46fc2fb7ea am 504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 
* commit '504960cbdc1db1424b1a4181d3860a21a5b7d363':
  Add callbacks for MediaProjection start / stop.
 2014-08-19 00:33:05 +00:00
Svetoslav
4e64956c08 am 4c82c6d7: am 8dab46b4: Merge "Update the print spooler icon." into lmp-dev 
* commit '4c82c6d7ed44adc99af394f069672c87251efddf':
  Update the print spooler icon.
 2014-08-19 00:13:16 +00:00
Adam Lesinski
0ef02eac4e am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit 'aae8a25abafd824a7d6f644ca00518029e822a03':
  Include build number in aapt version
 2014-08-19 00:09:12 +00:00
destradaa
b35e41e122 am 8e9d264e: am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 
* commit '8e9d264ef76061bbc33f79cbada560c5461c64b8':
  Add @SystemApi annotation to Geofence Hardware types.
 2014-08-19 00:09:06 +00:00
Svetoslav
128518a942 am 8dab46b4: Merge "Update the print spooler icon." into lmp-dev 
* commit '8dab46b479203b0b5ebad303d97d2eae25dad060':
  Update the print spooler icon.
 2014-08-19 00:05:41 +00:00
Adam Lesinski
40470f995f am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit '427964ed3c2647dcd5669ce77ec387bf71ba13f0':
  Include build number in aapt version
 2014-08-18 23:57:33 +00:00
destradaa
789f5c7986 am 420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev 
* commit '420fadbd5903a2a623ae412dbd416c2a4bf7bde7':
  Add @SystemApi annotation to Geofence Hardware types.
 2014-08-18 23:57:28 +00:00
Christopher Tate
bc19713276 am a710f3b4: am 7a32dd7d: Merge "Minor restore fixes" into lmp-dev 
* commit 'a710f3b4a2aa1c6c6f5131e42e6edee8a8c4f15a':
  Minor restore fixes
 2014-08-18 23:54:14 +00:00
arete
9dae3b831a am d4f0067e: am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit 'd4f0067eee8db6f0ec581d01a5611174761423c0':
  Expose system apis for backup transport migration
 2014-08-18 23:54:09 +00:00
Christopher Tate
15dd21b7d1 am 7a32dd7d: Merge "Minor restore fixes" into lmp-dev 
* commit '7a32dd7dcd913a6b85fa4627f64f589445a1f712':
  Minor restore fixes
 2014-08-18 23:46:24 +00:00
arete
a219adc093 am 4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev 
* commit '4aec0ea84b5ca5e00e2c4d728927931d568fd29c':
  Expose system apis for backup transport migration
 2014-08-18 23:46:19 +00:00
Jae Seo
107c188616 am d90db994: am d733a820: TIF: Fix some comment warnings 
* commit 'd90db994ce07ffaa9512e5af39458d0c241d9f2d':
  TIF: Fix some comment warnings
 2014-08-18 23:37:11 +00:00
Adam Powell
2b74dfa1ac am 9c7cf696: am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit '9c7cf696ecb286c90ae19aaaa1e9080a9fb00b4e':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:37:07 +00:00
Dongwon Kang
911d0827ca TIF: verify the hardware input ID from getHardwareInputId(). 
This will prevent an input from displaying other tuner inputs.

Change-Id: I77a6b99599eac4a9048a12e2928bc16b34d94343
 2014-08-18 23:33:26 +00:00
Jae Seo
4dbb612c8d am d733a820: TIF: Fix some comment warnings 
* commit 'd733a820cf16126d80ee01e8065ccccf91eee406':
  TIF: Fix some comment warnings
 2014-08-18 23:28:47 +00:00
Adam Powell
c980f48dae am d3b22a5c: Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 
* commit 'd3b22a5c0b91972a1a938d7c8399971ce04167d7':
  Fix a bug propagating navigation button events from ToolbarActionBar
 2014-08-18 23:28:42 +00:00
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00
arete
4220a9a9f6 Merge "Expose system apis for backup transport migration" into lmp-dev 2014-08-18 23:27:42 +00:00
Jae Seo
5b1caaf7d8 TIF: Fix some comment warnings 
Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
 2014-08-18 23:25:48 +00:00
Jake Hamby
cfd22a35da am 31124f44: am bfdc340a: Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev 
* commit '31124f444c6618fdea1cacaa847874be0fba26a7':
  Add page info in each segment if carrier does not support EMS.
 2014-08-18 23:24:58 +00:00
Jeff Sharkey
fbc5d259db am 442dcce1: am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '442dcce17ee6f656c8a0ec872f3c6730dd603796':
  Progress towards staging ASECs.
 2014-08-18 23:16:36 +00:00
Alan Viverette
6d58ab0346 am 3d3783ec: am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '3d3783ec27d7b3aafbd08d6695d37543e9a337f8':
  Update fast scroller preview for Material
 2014-08-18 23:16:31 +00:00
Adam Lesinski
5da86bc21a am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit '4b9b84c5db6b0b6ba629cf64bc894016fe2cf0c1':
  Revert "Include build number in aapt version"
 2014-08-18 23:16:26 +00:00
Jake Hamby
1e3e731f45 am bfdc340a: Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev 
* commit 'bfdc340af5c75fc99cc6abacb72c1ed1a24344a0':
  Add page info in each segment if carrier does not support EMS.
 2014-08-18 23:16:21 +00:00
Jeff Sharkey
3f1b71f0a2 am 90870a5b: Merge "Progress towards staging ASECs." into lmp-dev 
* commit '90870a5bba8cbe540e257c30a8692fc38ed72753':
  Progress towards staging ASECs.
 2014-08-18 23:08:16 +00:00
Alan Viverette
ee9e1a3cc3 am 417f92da: Merge "Update fast scroller preview for Material" into lmp-dev 
* commit '417f92da9ee79296207279cd04fe889e7ebb5cca':
  Update fast scroller preview for Material
 2014-08-18 23:08:11 +00:00
Adam Lesinski
814a6751cf am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit 'f611c1b5d4fd6d6d1e46954a95760c2a0df3d264':
  Revert "Include build number in aapt version"
 2014-08-18 23:08:07 +00:00