OSDN Git Service

android-x86/frameworks-base.git
9 years agoEnsuring that we write to disk first.
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.

Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2

9 years agoMerge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
Doris Liu [Fri, 29 May 2015 20:28:19 +0000 (20:28 +0000)]
Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

9 years agoMerge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:02:53 +0000 (20:02 +0000)]
Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

9 years agoUse AtomicFile APIs correctly when reading.
Svetoslav [Fri, 29 May 2015 20:00:32 +0000 (13:00 -0700)]
Use AtomicFile APIs correctly when reading.

21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d

9 years agoMerge "Cleanup Binder token resetting." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:59:33 +0000 (19:59 +0000)]
Merge "Cleanup Binder token resetting." into mnc-dev

9 years agoMerge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
John Spurlock [Fri, 29 May 2015 19:50:06 +0000 (19:50 +0000)]
Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev

9 years agoCleanup Binder token resetting.
Alex Klyubin [Fri, 29 May 2015 19:39:32 +0000 (12:39 -0700)]
Cleanup Binder token resetting.

This is a follow-up to 7cbcfd4fc1e538bd391a20cdd00dd1494ace2d0e where
during the review it was pointed out that the code could be
streamlined.

Bug: 18088752
Change-Id: Iecb9fdbc31a0f3cdcb94ddb1b3e7e12a0543a231

9 years agoZen: Dim status bar alarm icon when zen = total silence.
John Spurlock [Fri, 29 May 2015 19:35:53 +0000 (15:35 -0400)]
Zen: Dim status bar alarm icon when zen = total silence.

Bug: 21359239
Change-Id: I5bf207c4c181869127ed8b90787cbd7d9bb0f6c2

9 years agoEnable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 19:32:48 +0000 (12:32 -0700)]
Enable Keyguard debug logging

Bug: 21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0

9 years agoMerge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:15:17 +0000 (19:15 +0000)]
Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

9 years agoam f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile...
Quddus Chong [Fri, 29 May 2015 18:55:02 +0000 (18:55 +0000)]
am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'f253e7d547f22bb02ef943bd80f598ca30302bda':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agoam c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug...
Quddus Chong [Fri, 29 May 2015 18:40:50 +0000 (18:40 +0000)]
am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agodocs: Fix issue where images are not appearing in mobile browsers.
Quddus Chong [Fri, 29 May 2015 17:51:56 +0000 (10:51 -0700)]
docs: Fix issue where images are not appearing in mobile browsers.
bug: 21517956

Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453

9 years agoUpdate doc to include how clipToPadding affects EdgeEffect
Doris Liu [Fri, 29 May 2015 00:26:46 +0000 (17:26 -0700)]
Update doc to include how clipToPadding affects EdgeEffect

Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a

9 years agoMerge "Un-@hide some missed video APIs." into mnc-dev
Tyler Gunn [Fri, 29 May 2015 18:18:37 +0000 (18:18 +0000)]
Merge "Un-@hide some missed video APIs." into mnc-dev

9 years agoMerge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
John Spurlock [Fri, 29 May 2015 18:07:35 +0000 (18:07 +0000)]
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

9 years agoMerge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 18:01:07 +0000 (18:01 +0000)]
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev

9 years agoMerge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
Andy Hung [Fri, 29 May 2015 17:51:49 +0000 (17:51 +0000)]
Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev

9 years agoMerge "Don't use string that has been removed." into mnc-dev
Jason Monk [Fri, 29 May 2015 17:50:49 +0000 (17:50 +0000)]
Merge "Don't use string that has been removed." into mnc-dev

9 years agoDon't use string that has been removed.
Jason Monk [Fri, 29 May 2015 17:44:32 +0000 (13:44 -0400)]
Don't use string that has been removed.

Change-Id: I60edc3f23f40e48013165dccab83af536582f1c4

9 years agoam 92614179: am dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 17:32:51 +0000 (17:32 +0000)]
am 92614179: am dedc768f: Fix typo

* commit '926141795c3115d674be2ed0a735e3b994e31c03':
  Fix typo

9 years agoMerge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
James Cook [Fri, 29 May 2015 17:30:21 +0000 (17:30 +0000)]
Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev

9 years agoam dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 17:18:35 +0000 (17:18 +0000)]
am dedc768f: Fix typo

* commit 'dedc768f829908242bda75b56d4a77ff247d5609':
  Fix typo

9 years agoClarify AudioFormat sample rate and encoding documentation
Andy Hung [Thu, 28 May 2015 01:57:54 +0000 (18:57 -0700)]
Clarify AudioFormat sample rate and encoding documentation

Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1

9 years agoUn-@hide some missed video APIs.
Tyler Gunn [Fri, 29 May 2015 17:05:46 +0000 (10:05 -0700)]
Un-@hide some missed video APIs.

- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.

Bug: 21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1

9 years agoAdd algorithm aliases for Android Keystore HMACs.
Alex Klyubin [Fri, 29 May 2015 17:01:55 +0000 (10:01 -0700)]
Add algorithm aliases for Android Keystore HMACs.

The aliases have been copied from Conscrypt.

Bug: 18088752
Change-Id: I1c66d8c3655f57db41cc0b9cc88d08b44b4a774b

9 years agoRefactor Android Keystore CipherSpi base class.
Alex Klyubin [Thu, 28 May 2015 18:07:19 +0000 (11:07 -0700)]
Refactor Android Keystore CipherSpi base class.

This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.

Bug: 18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4

9 years agoMerge "Move ZoneGetter into SettingsLib" into mnc-dev
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev

9 years agoZen: Add warning text if total silence will eat the next alarm.
John Spurlock [Fri, 29 May 2015 16:04:21 +0000 (12:04 -0400)]
Zen: Add warning text if total silence will eat the next alarm.

Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:57:50 +0000 (15:57 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:57:37 +0000 (15:57 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca.

Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:33:29 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:33:18 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267

9 years agoFix typo
Glenn Kasten [Fri, 29 May 2015 15:11:24 +0000 (08:11 -0700)]
Fix typo

Change-Id: I21ff7773056975b6941a5f1126d43b2e04aa5cd5

9 years agoMerge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 15:04:51 +0000 (15:04 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

9 years agoRevert "Import translations. DO NOT MERGE"
Geoff Mendal [Fri, 29 May 2015 15:04:40 +0000 (15:04 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d

9 years agoMerge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Fri, 29 May 2015 15:03:14 +0000 (15:03 +0000)]
Merge "Tuner: add battery pct preference." into mnc-dev

9 years agoTuner: add battery pct preference.
John Spurlock [Fri, 29 May 2015 14:48:22 +0000 (10:48 -0400)]
Tuner: add battery pct preference.

And fix questionable code organization choices in BatteryMeterView.

Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:51:55 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:51:27 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:50:28 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:49:43 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:38:08 +0000 (09:38 -0500)]
Import translations. DO NOT MERGE

Change-Id: I22703941cc87c8ad2aacc04671d3c62cb1e81037
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:31:36 +0000 (07:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:28:27 +0000 (09:28 -0500)]
Import translations. DO NOT MERGE

Change-Id: I290120b9af321f28cbf754ebc76a154e8b806ddf
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:27:57 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import

9 years agoMerge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 14:24:20 +0000 (14:24 +0000)]
Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 14:10:35 +0000 (09:10 -0500)]
Import translations. DO NOT MERGE

Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import

9 years agoMerge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into...
Narayan Kamath [Fri, 29 May 2015 14:04:40 +0000 (14:04 +0000)]
Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

9 years agoAvoid inspecting packages twice to deduce ABIs for moves / installs.
Narayan Kamath [Thu, 28 May 2015 10:23:57 +0000 (11:23 +0100)]
Avoid inspecting packages twice to deduce ABIs for moves / installs.

In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.

bug: 21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298

9 years agoMerge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev

9 years agoIncreased the falsing treashold for quick settings
Selim Cinek [Fri, 29 May 2015 12:39:08 +0000 (05:39 -0700)]
Increased the falsing treashold for quick settings

Bug: 21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245

9 years agoam 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and...
Dirk Dougherty [Fri, 29 May 2015 07:00:58 +0000 (07:00 +0000)]
am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '906a91b4e794015bb2609ded232bb50d4478c3c7':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoam 08710f1b: Add video for families page. Add Studio version reqts and beta notice...
Dirk Dougherty [Fri, 29 May 2015 06:48:57 +0000 (06:48 +0000)]
am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '08710f1b69e2188a439b54f1ae59a574f71681d0':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoAdd video for families page. Add Studio version reqts and beta notice for data bindin...
Dirk Dougherty [Fri, 29 May 2015 05:01:36 +0000 (22:01 -0700)]
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad

9 years agoam 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and delet...
David Friedman [Fri, 29 May 2015 05:45:00 +0000 (05:45 +0000)]
am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoam 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 05:31:56 +0000 (05:31 +0000)]
am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '90042a5f8c987582736f4eed714aeba9416003c6':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoDocs: Corrects technical content of one sentence, and deletes another.
David Friedman [Fri, 29 May 2015 04:07:46 +0000 (21:07 -0700)]
Docs: Corrects technical content of one sentence, and deletes another.

Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4

9 years agofix NPE in shutdown thread
Guang Zhu [Fri, 29 May 2015 03:50:03 +0000 (20:50 -0700)]
fix NPE in shutdown thread

null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f

9 years agoam 2f85475c: am 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 02:28:05 +0000 (02:28 +0000)]
am 2f85475c: am 7d36a250: docs: Quick spelling fix

* commit '2f85475c18d68d8719f20e4385dccb3ba0117d1a':
  docs: Quick spelling fix

9 years agoam 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 02:15:04 +0000 (02:15 +0000)]
am 7d36a250: docs: Quick spelling fix

* commit '7d36a25097099b958262e90d22992ce4cac485c9':
  docs: Quick spelling fix

9 years agoZen: Use account name instead of calendar id in event conditions.
John Spurlock [Fri, 29 May 2015 02:13:03 +0000 (22:13 -0400)]
Zen: Use account name instead of calendar id in event conditions.

 - Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2

9 years agoMerge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
Sungsoo Lim [Fri, 29 May 2015 01:36:57 +0000 (01:36 +0000)]
Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev

9 years agodocs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 01:33:29 +0000 (18:33 -0700)]
docs: Quick spelling fix

Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.

Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95

9 years agoMerge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
Yorke Lee [Fri, 29 May 2015 00:55:11 +0000 (00:55 +0000)]
Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev

9 years agoMerge "Improve error handling for AudioTrack write with PTS" into mnc-dev
Glenn Kasten [Fri, 29 May 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev

9 years agoMerge "Use getRunAdvance to position cursor" into mnc-dev
Raph Levien [Fri, 29 May 2015 00:05:07 +0000 (00:05 +0000)]
Merge "Use getRunAdvance to position cursor" into mnc-dev

9 years agoMerge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
Alan Viverette [Thu, 28 May 2015 23:55:30 +0000 (23:55 +0000)]
Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev

9 years agoMerge "CountryDetector no longer requires location permissions." into mnc-dev
Makoto Onuki [Thu, 28 May 2015 23:54:08 +0000 (23:54 +0000)]
Merge "CountryDetector no longer requires location permissions." into mnc-dev

9 years agoMerge "Rely on IMM#focusOut() to close input session." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:52:49 +0000 (23:52 +0000)]
Merge "Rely on IMM#focusOut() to close input session." into mnc-dev

9 years agoSynchronize Theme.Material and Theme.Material light attributes
Alan Viverette [Thu, 28 May 2015 23:52:29 +0000 (16:52 -0700)]
Synchronize Theme.Material and Theme.Material light attributes

Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.

Bug: 21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09

9 years agoMerge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
Brian Attwell [Thu, 28 May 2015 23:43:39 +0000 (23:43 +0000)]
Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev

9 years agoMerge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into...
Alan Viverette [Thu, 28 May 2015 23:43:22 +0000 (23:43 +0000)]
Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev

9 years agoMerge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
Andres Morales [Thu, 28 May 2015 23:41:03 +0000 (23:41 +0000)]
Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

9 years agoUse getRunAdvance to position cursor
Raph Levien [Thu, 28 May 2015 23:16:24 +0000 (16:16 -0700)]
Use getRunAdvance to position cursor

TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).

This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.

We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.

Bug: 21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571

9 years agoRename "end" to "endExclusive" in addPhoneTtsSpan
Brian Attwell [Thu, 28 May 2015 23:23:37 +0000 (16:23 -0700)]
Rename "end" to "endExclusive" in addPhoneTtsSpan

Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025

9 years agoMerge "Clear the inset of previous IME when necessary." into mnc-dev
Yohei Yukawa [Thu, 28 May 2015 23:20:11 +0000 (23:20 +0000)]
Merge "Clear the inset of previous IME when necessary." into mnc-dev

9 years agoMake ACTION_CONNECTION_SERVICE_CONFIGURE public
Yorke Lee [Thu, 28 May 2015 22:46:12 +0000 (15:46 -0700)]
Make ACTION_CONNECTION_SERVICE_CONFIGURE public

Bug: 21499146
Change-Id: I3b931231807eec0aed91832013c7c055005fc9ad

9 years agoMerge "Add extras to Connections/Calls. (1/3)" into mnc-dev
Santos Cordon [Thu, 28 May 2015 23:06:15 +0000 (23:06 +0000)]
Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev

9 years agoMerge "Cleaning up logging in TelephonyManager." into mnc-dev
Amit Mahajan [Thu, 28 May 2015 23:05:27 +0000 (23:05 +0000)]
Merge "Cleaning up logging in TelephonyManager." into mnc-dev

9 years agoam c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete...
David Friedman [Thu, 28 May 2015 22:54:29 +0000 (22:54 +0000)]
am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoClear the inset of previous IME when necessary.
Yohei Yukawa [Thu, 28 May 2015 01:54:18 +0000 (18:54 -0700)]
Clear the inset of previous IME when necessary.

In the following scenario, the system continues keeping the previous
IME's inset in the display until the new IME shows its window.
1. an IME shows its software keyboard with reporting non-empty inset.
2. the user switches to another IME, which does not show the software
   keyboard when it is selected (e.g., because the physical keyboard
   is connected.)

This CL tries to address above situation by introducing a new state
flag IMMS#mShouldClearInsetOfPreviousIme to clear the previous IME's
inset when necessary.

Bug: 15922840
Change-Id: Ib04967f39b2529251e4835c42e9f99dba2cf43f2

9 years agoassist: Fix reported colors/styles for TextView/Switch
James Cook [Thu, 28 May 2015 22:52:44 +0000 (15:52 -0700)]
assist: Fix reported colors/styles for TextView/Switch

Changes to the data provided to AssistStructure:
* Text foreground color is correct even if the view has not yet been
painted.
* Text background color is now always 1 (TEXT_COLOR_UNDEFINED) for a
TextView, as it has no separate concept of background color.
* Switch now reports the text size/color/style of the label text
(usually user visible) rather than the on/off text on the button
itself (usually hidden in Material, and not usually revelant when
visible).

Bug: 21080375
Change-Id: I7e15f68d89510a76cab76031c2c8ca6ca3f32435

9 years agoMerge "Clean up calls to Rect.intersect()" into mnc-dev
Doris Liu [Thu, 28 May 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Clean up calls to Rect.intersect()" into mnc-dev

9 years agoMerge "Deprecations are warnings not errors" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 22:51:15 +0000 (22:51 +0000)]
Merge "Deprecations are warnings not errors" into mnc-dev

9 years agoMerge "Fix round cap approximation to understand scale" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:50:02 +0000 (22:50 +0000)]
Merge "Fix round cap approximation to understand scale" into mnc-dev

9 years agoam 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsole...
David Friedman [Thu, 28 May 2015 22:40:16 +0000 (22:40 +0000)]
am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit '9ffbf9bd9b40487b7edacdf0c790714f080494c4':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoam 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in...
Quddus Chong [Thu, 28 May 2015 22:40:01 +0000 (22:40 +0000)]
am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit '01c4d8d357aef661d15ef770986e35be324c6d03':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoClean up calls to Rect.intersect()
Doris Liu [Thu, 28 May 2015 22:35:52 +0000 (15:35 -0700)]
Clean up calls to Rect.intersect()

This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2

9 years agoMerge "Don't kill process with active service/receiver when task is removed." into...
Wale Ogunwale [Thu, 28 May 2015 22:38:02 +0000 (22:38 +0000)]
Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev

9 years agoMerge "Fix build" into mnc-dev
Chris Craik [Thu, 28 May 2015 22:34:53 +0000 (22:34 +0000)]
Merge "Fix build" into mnc-dev

9 years agoFix build
Chris Craik [Thu, 28 May 2015 22:33:40 +0000 (15:33 -0700)]
Fix build

Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9

9 years agoMerge "Fix drawable CTS breakages" into mnc-dev
Alan Viverette [Thu, 28 May 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Fix drawable CTS breakages" into mnc-dev

9 years agoam 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed...
David Friedman [Thu, 28 May 2015 22:33:22 +0000 (22:33 +0000)]
am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

* commit '92451a97271d014ab10ca4685beae728d53601b4':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.

9 years agoMerge "Docs: A few minor corrections: deleted obsolete sentences, fixed references...
David Friedman [Thu, 28 May 2015 22:16:19 +0000 (22:16 +0000)]
Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs

9 years agoam ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence...
David Friedman [Thu, 28 May 2015 22:09:15 +0000 (22:09 +0000)]
am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs

* commit 'ed8c62955aa6512fb4e929e59893c774ae894358':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.

9 years agoMerge "Use path intersection instead of saveLayer+mesh to mask projected ripples...
Chris Craik [Thu, 28 May 2015 22:03:06 +0000 (22:03 +0000)]
Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev

9 years agoMerge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev
Deepanshu Gupta [Thu, 28 May 2015 21:59:08 +0000 (21:59 +0000)]
Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev

9 years agoam dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
Quddus Chong [Thu, 28 May 2015 21:59:02 +0000 (21:59 +0000)]
am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.

* commit 'dcfa755616504fb4443f4d79d936f30c3742d77a':
  docs: Fixed training TOC formatting and broken link in TV training landing.

9 years agoMerge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into...
David Friedman [Thu, 28 May 2015 21:58:57 +0000 (21:58 +0000)]
Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs