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

149071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Talavera
3d16ad8aba am 5cf90bd9: Merge "Add cross profile intent in order after intent filter resolution" into lmp-dev 
* commit '5cf90bd9d15ac27b0fc26007d8f50abed0913d4a':
  Add cross profile intent in order after intent filter resolution
 2014-08-19 09:56:21 +00:00
Ji-Hwan Lee
69645b10cd am 1becc968: TIF: Call setMain(false) when session is released. 
* commit '1becc968b47b82d2bea2ee83f2fb91dcda07e54e':
  TIF: Call setMain(false) when session is released.
 2014-08-19 06:23:19 +00:00
Ji-Hwan Lee
15c56aac98 TIF: Call setMain(false) when session is released. 
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
 2014-08-19 06:11:04 +00:00
Jinsuk Kim
b79ad0a3d7 am 53130b88: Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 
* commit '53130b886f8baf2e7e75fdae8f71d90cc2b51929':
  CEC: Invoke events listener upon MHL device state change
 2014-08-19 06:07:54 +00:00
Andrew Solovay
7cb2570a0a am 338c46a1: am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '338c46a18d5d7f2715248b4d512c9de559843864':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:59:55 +00:00
Andrew Solovay
fc6b01f463 am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-19 05:52:57 +00:00
Jaewan Kim
8b1b8a302c am ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev 
* commit 'ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
  Fix NPE when passing null TvContentRating
 2014-08-19 05:03:07 +00:00
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
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
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
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
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
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
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
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
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
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
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
Dianne Hackborn
26ac5367c1 am 3a77663b: Merge "Fix path for handling system window with app token." into lmp-dev 
* commit '3a77663bd6a4dd3f06552ed49db03e8c09181ca2':
  Fix path for handling system window with app token.
 2014-08-18 22:56:27 +00:00
Alan Viverette
b69d55da77 am a01596de: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 
* commit 'a01596de0264c260aa9b77783bd30e76d43ce6af':
  Throw exception when inset drawable is missing drawable attribute
 2014-08-18 22:32:17 +00:00
Chet Haase
6b491ddb14 am 37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev 
* commit '37a522aac43cabab58f0653e4bf29897719e9389':
  Fix crash in AnimationDrawable
 2014-08-18 22:12:11 +00:00
Adam Lesinski
8e8ef3b151 am a7ce555e: Include build number in aapt version 
* commit 'a7ce555ee82ed91345a54ee171dc9a415b65e134':
  Include build number in aapt version
 2014-08-18 21:53:46 +00:00
Jon Miranda
611f8f17f3 Merge "Exposes style and theme data, adds developer option." into lmp-dev 2014-08-18 21:31:41 +00:00
Jon Miranda
836c0a8b94 Exposes style and theme data, adds developer option. 
Adds support for a String[] return type in ViewDebug; and in addition to that,
the hasAdjacentMapping method can use the String array as means to map a key to
its value.

Adds DEBUG_VIEW_ATTRIBUTES to Settings so that the heavy per-view
computations only affect those who opt in. This setting is used in
CoreSettingsObserver to avoid impacting start time.

Change-Id: I8f507e4e5361414c30d247e8d9815205feb5e91f
 2014-08-18 18:32:53 -07:00
Michael Wright
8b987196ca Merge "Update MenuItem#setShortcut docs" into lmp-dev 2014-08-18 21:31:41 +00:00
Alan Viverette
d59c585588 Merge "Update fast scroller preview for Material" into lmp-dev 2014-08-18 21:31:41 +00:00
Alan Viverette
04019ee91b Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev 2014-08-18 21:31:41 +00:00
Chet Haase
32e966ccb3 Merge "Fix crash in AnimationDrawable" into lmp-dev 2014-08-18 21:31:41 +00:00
Andrew Solovay
eb60d0f193 am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '94174ff788cc6a4f79e2026d7d0995f75246a2de':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:19:37 +00:00
Andrew Solovay
94174ff788 am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs 
* commit '8319455afca3dc4c8f799d7752dfa44780cf8855':
  docs: Documented new fields returned by getSkuDetails().
 2014-08-18 21:08:17 +00:00
Adam Lesinski
71809ee7f6 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
 2014-08-18 21:08:15 +00:00
Andy Hung
4ad041cb99 am 5c73ba37: Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 
* commit '5c73ba37afb1a891466551c107633e2a632f7775':
  Fix 48kHz limitation on AudioTrack
 2014-08-18 21:06:20 +00:00
Adam Powell
8f4a21e466 Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8 Fix a bug propagating navigation button events from ToolbarActionBar 
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.

Bug 16980711

Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
 2014-08-18 15:58:23 -07:00
Adam Lesinski
27a217453f Merge "Revert "Include build number in aapt version"" into lmp-dev 2014-08-18 21:00:53 +00:00