OSDN Git Service
Adam Powell [Tue, 19 Aug 2014 22:19:41 +0000 (22:19 +0000)]
am
09662e68: Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev
* commit '
09662e68baf9748ff9bedcfb0fa59e388ec54588':
Make Toolbars (and Toolbar-based ActionBars) have constant text size
Ihab Awad [Tue, 19 Aug 2014 21:31:34 +0000 (21:31 +0000)]
am
940e67a8: Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev
* commit '
940e67a88bb5cc6f97afa4f0a703e428d55c537f':
ConnectionService API has only one completed callback (1/3)
Winson Chung [Tue, 19 Aug 2014 20:55:14 +0000 (20:55 +0000)]
am
a4f6df0f: Merge "Adding shadows to the focus state and fab button. (Bug
16950262)" into lmp-dev
* commit '
a4f6df0f51adc0ae69fa845ceb7d0a20713cc1b2':
Adding shadows to the focus state and fab button. (Bug
16950262)
Winson Chung [Tue, 19 Aug 2014 20:55:09 +0000 (20:55 +0000)]
am
e6c940f7: Small tweaks to the stack curve and header transition. (Bug
16656169)
* commit '
e6c940f7a6a831e1e0a1bf18f9e57b0408dc72ef':
Small tweaks to the stack curve and header transition. (Bug
16656169)
Adam Lesinski [Tue, 19 Aug 2014 20:55:05 +0000 (20:55 +0000)]
am
960ab6de: Merge "Add Shell command to set AppOps permissions" into lmp-dev
* commit '
960ab6de31ddd1a92e7a2e1829a2f2cd9b209c13':
Add Shell command to set AppOps permissions
Amith Yamasani [Tue, 19 Aug 2014 20:47:10 +0000 (20:47 +0000)]
am
1e8ba427: Merge "Rephrase the Exit guest action and dialog text" into lmp-dev
* commit '
1e8ba427abacc928f018ceaf21a9278de886b43d':
Rephrase the Exit guest action and dialog text
Winson Chung [Fri, 15 Aug 2014 19:27:37 +0000 (12:27 -0700)]
Small tweaks to the stack curve and header transition. (Bug
16656169)
Change-Id: I96120063a66f267ad0b6a39b3dd020bc030083b8
Tim Murray [Tue, 19 Aug 2014 20:39:05 +0000 (20:39 +0000)]
am
9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev
* commit '
9ba9298e028e32eb6b1058dfb47eeae5fda164c4':
Stop sign-extending RS IDs.
Tim Murray [Tue, 19 Aug 2014 20:39:01 +0000 (20:39 +0000)]
am
3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev
* commit '
3c02b0201c4e57bb493a926ee79aaf80fbd1ff7b':
Fix IO_INPUT with 64-bit.
John Spurlock [Tue, 19 Aug 2014 20:26:46 +0000 (20:26 +0000)]
am
cb877145: Merge "Zen: Remove "allow disable" filter from noman." into lmp-dev
* commit '
cb8771459629d1801cbecb1bad1754351e24f083':
Zen: Remove "allow disable" filter from noman.
George Mount [Tue, 19 Aug 2014 19:58:10 +0000 (19:58 +0000)]
am
793b08cd: Merge "Set start transform before animator starts." into lmp-dev
* commit '
793b08cd65f98edb48fd6e3dae440b0d71405567':
Set start transform before animator starts.
Lorenzo Colitti [Tue, 19 Aug 2014 19:29:11 +0000 (19:29 +0000)]
am
14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev
* commit '
14152c7994d690a5ee0a0aad19701557407a4d70':
Stop using LinkProperties for static configuration.
Chris Craik [Tue, 19 Aug 2014 19:29:07 +0000 (19:29 +0000)]
am
fc1bf228: Merge "Don\'t cast shadows from gradients with transparent parts" into lmp-dev
* commit '
fc1bf228ec27ca3a1fd2d570650a003f0045a64b':
Don't cast shadows from gradients with transparent parts
Jesse Hall [Tue, 19 Aug 2014 19:16:50 +0000 (19:16 +0000)]
am
d30eb64f: am
87978406: (-s ours) am
df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
* commit '
d30eb64f61f1cacb1bfca1be512bc1d208206f08':
VirtualDisplayAdapter: Set the transaction surface even if NULL
Shishir Agrawal [Tue, 19 Aug 2014 19:16:45 +0000 (19:16 +0000)]
am
0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
* commit '
0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
Jesse Hall [Tue, 19 Aug 2014 19:12:08 +0000 (19:12 +0000)]
am
87978406: (-s ours) am
df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
* commit '
87978406b405cafc773703b7c849e372339527b8':
VirtualDisplayAdapter: Set the transaction surface even if NULL
Igor Murashkin [Tue, 19 Aug 2014 18:42:38 +0000 (18:42 +0000)]
am
77af33f8: Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
* commit '
77af33f81d2cbef1580a103c4efda6829f20c7e1':
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
Igor Murashkin [Tue, 19 Aug 2014 18:42:35 +0000 (18:42 +0000)]
am
3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
* commit '
3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
Lajos Molnar [Tue, 19 Aug 2014 18:14:43 +0000 (18:14 +0000)]
am
d127a4eb: media.MediaPlayer: don\'t check file-existence for URI-s with scheme
* commit '
d127a4ebe9cbd96dfe4879d969c4de0feedd4717':
media.MediaPlayer: don't check file-existence for URI-s with scheme
Lajos Molnar [Mon, 18 Aug 2014 21:26:55 +0000 (14:26 -0700)]
media.MediaPlayer: don't check file-existence for URI-s with scheme
setDataSource can be called with URI-s as well as with file paths.
Check file-existence only for file:// URI-s as well as URI-s
without scheme (which are assumed to be paths).
Bug:
17109022
Change-Id: I70f16a4f614dcef0b47fa264cf708473036cef4e
RoboErik [Tue, 19 Aug 2014 17:23:56 +0000 (17:23 +0000)]
am
368325e4: Update MediaSession APIs for council feedback
* commit '
368325e4ea45f51b28a09c78a7f0f3c1f052443f':
Update MediaSession APIs for council feedback
RoboErik [Fri, 15 Aug 2014 22:21:41 +0000 (15:21 -0700)]
Update MediaSession APIs for council feedback
-Changes MediaSessionManager.SessionsListener to OnActiveSessionsChangedListener
and makes it an interface.
-Renames MediaController.VolumeInfo to MediaController.AudioInfo
-Renames MediaSession.Track to MediaSession.Item
bug:
17059552
Change-Id: I3a0b4371700ad6657972c312a5ab89ddfac6df5b
Chris Craik [Tue, 19 Aug 2014 16:59:09 +0000 (16:59 +0000)]
am
fb52669c: Merge "Respect round rect clip when determining op opaqueness" into lmp-dev
* commit '
fb52669c01cb31164801e2320f9d3fc954b3f16b':
Respect round rect clip when determining op opaqueness
George Mount [Tue, 19 Aug 2014 16:51:15 +0000 (16:51 +0000)]
am
2d0cb7d1: Add a way to get Transitions from a TransitionSet.
* commit '
2d0cb7d16f3c280c1c4b317cbfc96a5bb9f3bc94':
Add a way to get Transitions from a TransitionSet.
John Spurlock [Tue, 19 Aug 2014 16:51:11 +0000 (16:51 +0000)]
am
a21bd779: Merge "Revert workaround for network limit dialog." into lmp-dev
* commit '
a21bd779ae24cbb08ae95361f13006b09e7e273a':
Revert workaround for network limit dialog.
George Mount [Mon, 18 Aug 2014 23:24:21 +0000 (16:24 -0700)]
Add a way to get Transitions from a TransitionSet.
Bug
17113732
Change-Id: I0a157a59448e66560ba2252709971131c5dea401
Tyler Gunn [Tue, 19 Aug 2014 16:35:16 +0000 (16:35 +0000)]
am
d324e32f: Merge "Exposing in-call API to other implementing classes. (1/4)" into lmp-dev
* commit '
d324e32f6643f9630fdc2dc6d88b6bf6e771886e':
Exposing in-call API to other implementing classes. (1/4)
Nicolas Prevot [Tue, 19 Aug 2014 16:35:12 +0000 (16:35 +0000)]
am
0587c834: When notify uri changes, changing the way we retrieve the userId.
* commit '
0587c834eeb980687e46b13b9cdeae54e5cb06cd':
When notify uri changes, changing the way we retrieve the userId.
Jesse Hall [Tue, 19 Aug 2014 16:31:17 +0000 (16:31 +0000)]
am
df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
* commit '
df7af46a4c034410dd1544415c3dcf19edef82e3':
VirtualDisplayAdapter: Set the transaction surface even if NULL
Jesse Hall [Mon, 5 May 2014 23:09:32 +0000 (16:09 -0700)]
VirtualDisplayAdapter: Set the transaction surface even if NULL
Bug:
17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
Nicolas Prevot [Wed, 6 Aug 2014 11:38:57 +0000 (12:38 +0100)]
When notify uri changes, changing the way we retrieve the userId.
Changing from UserHandle.getCallingUserId() to UserHandle.myUserId().
This makes the DocumentProvider work across users.
BUG:
16126891
Change-Id: I8ede64f2087894bb85eff5286803cdebd57e7137
Selim Cinek [Tue, 19 Aug 2014 15:51:17 +0000 (15:51 +0000)]
am
29b3fee4: Merge "Removed bugreport tile code from Quick settings" into lmp-dev
* commit '
29b3fee4e4f04ca023ee1302be47507e5635e921':
Removed bugreport tile code from Quick settings
Ihab Awad [Tue, 19 Aug 2014 21:21:33 +0000 (21:21 +0000)]
Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev
Ihab Awad [Mon, 18 Aug 2014 16:23:25 +0000 (09:23 -0700)]
ConnectionService API has only one completed callback (1/3)
Refactor ConnectionService API so it has only one "completed"
callback, and connection state and failure codes indicates what
happened. Previous design where we had separate callbacks for failure,
cancellation and success was error prone because it was easy to forget
to implement one of them.
Bug:
16993846
Bug:
17070939
Change-Id: I84bf5d041cf78193ccf80db201b08db3b7014830
Chris Craik [Tue, 19 Aug 2014 19:21:40 +0000 (19:21 +0000)]
Merge "Don't cast shadows from gradients with transparent parts" into lmp-dev
Chris Craik [Tue, 19 Aug 2014 01:15:36 +0000 (18:15 -0700)]
Don't cast shadows from gradients with transparent parts
bug:
17070982
Change-Id: I607dd3c9397845fce53b7f097ec0b57246077ea1
Chris Craik [Tue, 19 Aug 2014 16:51:32 +0000 (16:51 +0000)]
Merge "Respect round rect clip when determining op opaqueness" into lmp-dev
John Spurlock [Tue, 19 Aug 2014 14:36:29 +0000 (14:36 +0000)]
am
633c8237: Data usage limit strings + icon changes.
* commit '
633c82379f655f834b71edb8abfec4f113424ada':
Data usage limit strings + icon changes.
John Spurlock [Mon, 18 Aug 2014 15:35:36 +0000 (11:35 -0400)]
Data usage limit strings + icon changes.
- Change notification icon + text.
- Change QS detail overlimit title.
Bug:
17042440
Change-Id: I45ebd82c3e676ec265f29b778605444ae4a1c4f1
John Spurlock [Tue, 19 Aug 2014 12:37:24 +0000 (12:37 +0000)]
am
725ea467: Merge "QS: Enhance color inversion tile usage detection." into lmp-dev
* commit '
725ea467ecd30ea5391805cf628b7bf1a86e63e4':
QS: Enhance color inversion tile usage detection.
Kenny Guy [Tue, 19 Aug 2014 11:15:00 +0000 (11:15 +0000)]
am
181fc408: Merge "First part of renaming methods in LauncherApps." into lmp-dev
* commit '
181fc408746b5a6a1990670ce006984774d0c1a5':
First part of renaming methods in LauncherApps.
Selim Cinek [Tue, 19 Aug 2014 10:53:16 +0000 (10:53 +0000)]
am
a5b81bec: Properly announcing the shade state for accessibility
* commit '
a5b81bec0e80ebfa231db1fc59f268a1f628a2b6':
Properly announcing the shade state for accessibility
Selim Cinek [Tue, 19 Aug 2014 10:53:11 +0000 (10:53 +0000)]
am
279ce37b: Merge "Fixed accessibility issues with quick settings" into lmp-dev
* commit '
279ce37b8294a653af0f6c635aff97fcd6a9a06a':
Fixed accessibility issues with quick settings
Selim Cinek [Mon, 18 Aug 2014 14:46:22 +0000 (16:46 +0200)]
Properly announcing the shade state for accessibility
When we are entering / leaving quicksettings, accessible
users are now informed about the state change.
Also fixed a bug where the lockscreen was called notification
shade.
Bug:
15696654
Change-Id: I39d8ad3367c424ec5f9a3795be46d4785a19bbee
Esteban Talavera [Tue, 19 Aug 2014 09:56:21 +0000 (09:56 +0000)]
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
Ji-Hwan Lee [Tue, 19 Aug 2014 06:23:19 +0000 (06:23 +0000)]
am
1becc968: TIF: Call setMain(false) when session is released.
* commit '
1becc968b47b82d2bea2ee83f2fb91dcda07e54e':
TIF: Call setMain(false) when session is released.
Ji-Hwan Lee [Mon, 18 Aug 2014 13:01:55 +0000 (22:01 +0900)]
TIF: Call setMain(false) when session is released.
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.
Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
Jinsuk Kim [Tue, 19 Aug 2014 06:07:54 +0000 (06:07 +0000)]
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
Andrew Solovay [Tue, 19 Aug 2014 05:59:55 +0000 (05:59 +0000)]
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().
Andrew Solovay [Tue, 19 Aug 2014 05:52:57 +0000 (05:52 +0000)]
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().
Jaewan Kim [Tue, 19 Aug 2014 05:03:07 +0000 (05:03 +0000)]
am
ecd7d762: Merge "Fix NPE when passing null TvContentRating" into lmp-dev
* commit '
ecd7d762a47ad1a387db26c2b9ddc59ab310f00f':
Fix NPE when passing null TvContentRating
Dongwon Kang [Tue, 19 Aug 2014 04:10:41 +0000 (04:10 +0000)]
am
7c2ae217: Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev
* commit '
7c2ae2177f1163a80822535adbf013edeb615ad2':
TIF: verify the hardware input ID from getHardwareInputId().
Jon Miranda [Tue, 19 Aug 2014 02:58:25 +0000 (02:58 +0000)]
am
b315ca55: Merge "Exposes style and theme data, adds developer option." into lmp-dev
* commit '
b315ca55a9da8857ebe15547f59b333891cf7ed4':
Exposes style and theme data, adds developer option.
Chris Craik [Tue, 19 Aug 2014 02:55:36 +0000 (19:55 -0700)]
Respect round rect clip when determining op opaqueness
bug:
17115570
Change-Id: I30184b4678d333b5d222af8b61daa07a5e865cab
Adam Powell [Tue, 19 Aug 2014 22:14:06 +0000 (22:14 +0000)]
Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev
Adam Powell [Tue, 19 Aug 2014 02:09:27 +0000 (19:09 -0700)]
Make Toolbars (and Toolbar-based ActionBars) have constant text size
Bug
16397655
Change-Id: I908feb1c0a44e4d6061ed49a81c326c841bb2e7c
Adam Lesinski [Tue, 19 Aug 2014 20:45:15 +0000 (20:45 +0000)]
Merge "Add Shell command to set AppOps permissions" into lmp-dev
Adam Lesinski [Mon, 18 Aug 2014 23:10:28 +0000 (16:10 -0700)]
Add Shell command to set AppOps permissions
Change-Id: I6446543b27f0d2d2e69590a2807e713c6d5ccbbc
Amith Yamasani [Tue, 19 Aug 2014 20:40:44 +0000 (20:40 +0000)]
Merge "Rephrase the Exit guest action and dialog text" into lmp-dev
Tim Murray [Tue, 19 Aug 2014 20:33:25 +0000 (20:33 +0000)]
Merge "Stop sign-extending RS IDs." into lmp-dev
Tim Murray [Tue, 19 Aug 2014 20:33:15 +0000 (20:33 +0000)]
Merge "Fix IO_INPUT with 64-bit." into lmp-dev
Shishir Agrawal [Tue, 19 Aug 2014 19:11:26 +0000 (19:11 +0000)]
Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
Igor Murashkin [Tue, 19 Aug 2014 18:35:09 +0000 (18:35 +0000)]
Merge "camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader" into lmp-dev
Igor Murashkin [Tue, 19 Aug 2014 17:51:30 +0000 (10:51 -0700)]
camera2: Fix StreamConfigurationMap#getOutputSizes for ImageReader
Return empty array since no implementation-defined sizes are supported
Bug:
17007153
Change-Id: I178e89ef6b2640896f8657765beb458022d66ae5
Igor Murashkin [Tue, 19 Aug 2014 18:34:56 +0000 (18:34 +0000)]
Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
Igor Murashkin [Tue, 19 Aug 2014 18:04:03 +0000 (11:04 -0700)]
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
Bug:
17024375
Change-Id: Ie4e2a7f22caa842b4f3850f3739f22c5f6a9b88f
Jungshik Jang [Tue, 19 Aug 2014 02:33:49 +0000 (02:33 +0000)]
am
d9910efb: Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev
* commit '
d9910efb19df1b7aaebfc21d9f74977159d1b9f0':
Remove parameter field in HdmiCecKeycode.
Dongwon Kang [Tue, 19 Aug 2014 04:01:44 +0000 (04:01 +0000)]
Merge "TIF: verify the hardware input ID from getHardwareInputId()." into lmp-dev
Dianne Hackborn [Tue, 19 Aug 2014 01:25:41 +0000 (01:25 +0000)]
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
Ji-Hwan Lee [Tue, 19 Aug 2014 01:16:21 +0000 (01:16 +0000)]
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
Tim Murray [Tue, 19 Aug 2014 00:51:22 +0000 (17:51 -0700)]
Stop sign-extending RS IDs.
bug
16846318
bug
17006933
Change-Id: I6b1e73ed983ec583e80dc532e38c2ae2e504e608
Tim Murray [Mon, 18 Aug 2014 23:14:24 +0000 (16:14 -0700)]
Fix IO_INPUT with 64-bit.
bug
16846318
bug
17006933
Change-Id: Ic13ef26875d8a6fab1ffb542d62038b768a536ff
Dianne Hackborn [Tue, 19 Aug 2014 00:52:53 +0000 (00:52 +0000)]
am
8c1c4875: Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev
* commit '
8c1c48751db6c82826050f2bdde4c98c1aec8cd6':
Temporary: raise overflow limit, print all wake locks.
Michael Wright [Tue, 19 Aug 2014 00:41:10 +0000 (00:41 +0000)]
am
e835a130: Merge "Persist Show IME option." into lmp-dev
* commit '
e835a1305ff2b493f9488125c17314ff7bf34c22':
Persist Show IME option.
Michael Wright [Tue, 19 Aug 2014 00:41:04 +0000 (00:41 +0000)]
am
6e1edc12: Merge "Update MenuItem#setShortcut docs" into lmp-dev
* commit '
6e1edc12a27ab92cd47ccdd588982ee629c0ae97':
Update MenuItem#setShortcut docs
Michael Wright [Tue, 19 Aug 2014 00:33:05 +0000 (00:33 +0000)]
am
504960cb: Merge "Add callbacks for MediaProjection start / stop." into lmp-dev
* commit '
504960cbdc1db1424b1a4181d3860a21a5b7d363':
Add callbacks for MediaProjection start / stop.
Svetoslav [Tue, 19 Aug 2014 00:05:41 +0000 (00:05 +0000)]
am
8dab46b4: Merge "Update the print spooler icon." into lmp-dev
* commit '
8dab46b479203b0b5ebad303d97d2eae25dad060':
Update the print spooler icon.
Adam Lesinski [Mon, 18 Aug 2014 23:57:33 +0000 (23:57 +0000)]
am
427964ed: Merge "Include build number in aapt version" into lmp-dev
* commit '
427964ed3c2647dcd5669ce77ec387bf71ba13f0':
Include build number in aapt version
destradaa [Mon, 18 Aug 2014 23:57:28 +0000 (23:57 +0000)]
am
420fadbd: Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-dev
* commit '
420fadbd5903a2a623ae412dbd416c2a4bf7bde7':
Add @SystemApi annotation to Geofence Hardware types.
Christopher Tate [Mon, 18 Aug 2014 23:46:24 +0000 (23:46 +0000)]
am
7a32dd7d: Merge "Minor restore fixes" into lmp-dev
* commit '
7a32dd7dcd913a6b85fa4627f64f589445a1f712':
Minor restore fixes
arete [Mon, 18 Aug 2014 23:46:19 +0000 (23:46 +0000)]
am
4aec0ea8: Merge "Expose system apis for backup transport migration" into lmp-dev
* commit '
4aec0ea84b5ca5e00e2c4d728927931d568fd29c':
Expose system apis for backup transport migration
Dongwon Kang [Mon, 18 Aug 2014 23:05:17 +0000 (16:05 -0700)]
TIF: verify the hardware input ID from getHardwareInputId().
This will prevent an input from displaying other tuner inputs.
Change-Id: I77a6b99599eac4a9048a12e2928bc16b34d94343
Jae Seo [Mon, 18 Aug 2014 23:28:47 +0000 (23:28 +0000)]
am
d733a820: TIF: Fix some comment warnings
* commit '
d733a820cf16126d80ee01e8065ccccf91eee406':
TIF: Fix some comment warnings
Adam Powell [Mon, 18 Aug 2014 23:28:42 +0000 (23:28 +0000)]
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
Michael Wright [Tue, 19 Aug 2014 00:34:51 +0000 (00:34 +0000)]
Merge "Persist Show IME option." into lmp-dev
Michael Wright [Tue, 19 Aug 2014 00:26:06 +0000 (00:26 +0000)]
Merge "Add callbacks for MediaProjection start / stop." into lmp-dev
arete [Mon, 18 Aug 2014 23:39:05 +0000 (23:39 +0000)]
Merge "Expose system apis for backup transport migration" into lmp-dev
Jae Seo [Mon, 18 Aug 2014 22:03:33 +0000 (15:03 -0700)]
TIF: Fix some comment warnings
Also fixed some other obvious warnings from Eclipse
Bug:
16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
Jake Hamby [Mon, 18 Aug 2014 23:16:21 +0000 (23:16 +0000)]
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.
Jeff Sharkey [Mon, 18 Aug 2014 23:08:16 +0000 (23:08 +0000)]
am
90870a5b: Merge "Progress towards staging ASECs." into lmp-dev
* commit '
90870a5bba8cbe540e257c30a8692fc38ed72753':
Progress towards staging ASECs.
Alan Viverette [Mon, 18 Aug 2014 23:08:11 +0000 (23:08 +0000)]
am
417f92da: Merge "Update fast scroller preview for Material" into lmp-dev
* commit '
417f92da9ee79296207279cd04fe889e7ebb5cca':
Update fast scroller preview for Material
Adam Lesinski [Mon, 18 Aug 2014 23:08:07 +0000 (23:08 +0000)]
am
f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev
* commit '
f611c1b5d4fd6d6d1e46954a95760c2a0df3d264':
Revert "Include build number in aapt version"
Dianne Hackborn [Mon, 18 Aug 2014 22:56:27 +0000 (22:56 +0000)]
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.
Alan Viverette [Mon, 18 Aug 2014 22:32:17 +0000 (22:32 +0000)]
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
Chet Haase [Mon, 18 Aug 2014 22:12:11 +0000 (22:12 +0000)]
am
37a522aa: Merge "Fix crash in AnimationDrawable" into lmp-dev
* commit '
37a522aac43cabab58f0653e4bf29897719e9389':
Fix crash in AnimationDrawable
Adam Lesinski [Mon, 18 Aug 2014 21:53:46 +0000 (21:53 +0000)]
am
a7ce555e: Include build number in aapt version
* commit '
a7ce555ee82ed91345a54ee171dc9a415b65e134':
Include build number in aapt version
George Mount [Tue, 19 Aug 2014 19:51:22 +0000 (19:51 +0000)]
Merge "Set start transform before animator starts." into lmp-dev
George Mount [Mon, 18 Aug 2014 22:40:57 +0000 (15:40 -0700)]
Set start transform before animator starts.
Bug
16958319
ChangeImageTransform was waiting until the animator started
before setting the image matrix. Animators with a
start delay would leave the ImageView with the final transform
before the animator started.
Change-Id: I5ebc03b58a8697da3edf4a01c8906d60e7938f44
Jon Miranda [Tue, 19 Aug 2014 02:44:46 +0000 (02:44 +0000)]
Merge "Exposes style and theme data, adds developer option." into lmp-dev
Jon Miranda [Mon, 11 Aug 2014 19:32:26 +0000 (12:32 -0700)]
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