OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge commit 'bff7b32' into merge
Etan Cohen [Sat, 6 Jun 2015 00:15:18 +0000 (17:15 -0700)]
Merge commit 'bff7b32' into merge

9 years agoMerge commit '26d91e2' into merge
Etan Cohen [Sat, 6 Jun 2015 00:12:43 +0000 (17:12 -0700)]
Merge commit '26d91e2' into merge

9 years agoMerge commit '2226933' into merge
Etan Cohen [Sat, 6 Jun 2015 00:12:37 +0000 (17:12 -0700)]
Merge commit '2226933' into merge

9 years agoMerge commit 'fa0fbd6' into merge
Etan Cohen [Sat, 6 Jun 2015 00:12:34 +0000 (17:12 -0700)]
Merge commit 'fa0fbd6' into merge

9 years agoMerge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev
Etan Cohen [Sat, 6 Jun 2015 00:10:12 +0000 (00:10 +0000)]
Merge changes Ie0dd7a44,I5b3c0a48 into mnc-vt-dev

* changes:
  Merge commit 'e79fed5' into merge
  Merge commit 'abfdaea' into merge

9 years agoMerge commit 'e79fed5' into merge
Etan Cohen [Sat, 6 Jun 2015 00:08:17 +0000 (17:08 -0700)]
Merge commit 'e79fed5' into merge

9 years agoMerge commit 'abfdaea' into merge
Etan Cohen [Sat, 6 Jun 2015 00:07:48 +0000 (17:07 -0700)]
Merge commit 'abfdaea' into merge

Change-Id: I5b3c0a48c9d47bcb02d49132077f9e258481de2d

9 years agoam 772ca6cf: Merge "Update SMS permission description string" into mnc-dev
Svetoslav [Sat, 6 Jun 2015 00:06:50 +0000 (00:06 +0000)]
am 772ca6cf: Merge "Update SMS permission description string" into mnc-dev

* commit '772ca6cf2a72f9cbf6e5dbe8693112638f3b5481':
  Update SMS permission description string

9 years agoam 97c699e2: Merge "Don\'t run backups in battery-saver mode" into mnc-dev
Christopher Tate [Sat, 6 Jun 2015 00:06:45 +0000 (00:06 +0000)]
am 97c699e2: Merge "Don\'t run backups in battery-saver mode" into mnc-dev

* commit '97c699e2bd6169f867311bd40b25801432e78f68':
  Don't run backups in battery-saver mode

9 years agoam 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev
James Cook [Sat, 6 Jun 2015 00:06:41 +0000 (00:06 +0000)]
am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev

* commit '74f3d396712a805f5d2c6c1bb769c92b815dec87':
  Allow different visual and voice assist prompts

9 years agoam 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 00:06:36 +0000 (00:06 +0000)]
am 912f705f: Merge "Suppress default logging in SubscriptionManager." into mnc-dev

* commit '912f705f1f98ba2fc744601994dfbe12f391b0ae':
  Suppress default logging in SubscriptionManager.

9 years agoMerge commit 'b9e6d98' into merge
Etan Cohen [Fri, 5 Jun 2015 23:59:01 +0000 (16:59 -0700)]
Merge commit 'b9e6d98' into merge

9 years agoMerge "Update SMS permission description string" into mnc-dev
Svetoslav [Fri, 5 Jun 2015 23:53:29 +0000 (23:53 +0000)]
Merge "Update SMS permission description string" into mnc-dev

9 years agoUpdate SMS permission description string
Svetoslav [Fri, 5 Jun 2015 23:50:28 +0000 (16:50 -0700)]
Update SMS permission description string

Change-Id: I777615113dbdcd0df1b5f4984ae18bfa57976ba3

9 years agoMerge "Don't run backups in battery-saver mode" into mnc-dev
Christopher Tate [Fri, 5 Jun 2015 23:50:32 +0000 (23:50 +0000)]
Merge "Don't run backups in battery-saver mode" into mnc-dev

9 years agoMerge "Allow different visual and voice assist prompts" into mnc-dev
James Cook [Fri, 5 Jun 2015 23:49:57 +0000 (23:49 +0000)]
Merge "Allow different visual and voice assist prompts" into mnc-dev

9 years agoam 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev
Stefan Kuhne [Fri, 5 Jun 2015 23:47:00 +0000 (23:47 +0000)]
am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev

* commit '5c6c06bf187e6e96d9db1398108d613f86f5a912':
  Adding am send-trim-memory command

9 years agoMerge "Suppress default logging in SubscriptionManager." into mnc-dev
Sanket Padawe [Fri, 5 Jun 2015 23:45:40 +0000 (23:45 +0000)]
Merge "Suppress default logging in SubscriptionManager." into mnc-dev

9 years agoMerge "Adding am send-trim-memory command" into mnc-dev
Stefan Kuhne [Fri, 5 Jun 2015 23:37:13 +0000 (23:37 +0000)]
Merge "Adding am send-trim-memory command" into mnc-dev

9 years agoAllow different visual and voice assist prompts
James Cook [Thu, 4 Jun 2015 21:18:43 +0000 (14:18 -0700)]
Allow different visual and voice assist prompts

* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656

9 years agoam 8e518c81: Merge "Update docs to reflect correct time units" into mnc-dev
Adam Lesinski [Fri, 5 Jun 2015 23:33:16 +0000 (23:33 +0000)]
am 8e518c81: Merge "Update docs to reflect correct time units" into mnc-dev

* commit '8e518c81ea630ca37d373ceb90e3d6c01330cb38':
  Update docs to reflect correct time units

9 years agoam 093d9949: TIF: Replace explicit types with <>
Jae Seo [Fri, 5 Jun 2015 23:33:12 +0000 (23:33 +0000)]
am 093d9949: TIF: Replace explicit types with <>

* commit '093d994965bef197fb676731fc50f6f6f630b8fe':
  TIF: Replace explicit types with <>

9 years agoMerge "Update docs to reflect correct time units" into mnc-dev
Adam Lesinski [Fri, 5 Jun 2015 23:31:18 +0000 (23:31 +0000)]
Merge "Update docs to reflect correct time units" into mnc-dev

9 years agoAdding am send-trim-memory command
Stefan Kuhne [Fri, 5 Jun 2015 14:18:06 +0000 (07:18 -0700)]
Adding am send-trim-memory command

This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.

The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
 RUNNING_CRITICAL|COMPLETE]

Bug: 21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49

9 years agoTIF: Replace explicit types with <>
Jae Seo [Fri, 5 Jun 2015 23:13:03 +0000 (16:13 -0700)]
TIF: Replace explicit types with <>

Also removed unnecessary boxing/unboxing

Change-Id: I97ef6b7f369cac97a133180773be96463f2a813d

9 years agoam b40933de: Merge "TIF: Convert fields to local variables" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 23:17:34 +0000 (23:17 +0000)]
am b40933de: Merge "TIF: Convert fields to local variables" into mnc-dev

* commit 'b40933defeca2a27c1f0a5cf8f25919cb9ac2128':
  TIF: Convert fields to local variables

9 years agoSuppress default logging in SubscriptionManager.
Sanket Padawe [Fri, 5 Jun 2015 23:13:51 +0000 (16:13 -0700)]
Suppress default logging in SubscriptionManager.

Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7

9 years agoMerge "TIF: Convert fields to local variables" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 23:04:02 +0000 (23:04 +0000)]
Merge "TIF: Convert fields to local variables" into mnc-dev

9 years agoam 5dfe9d30: Merge "Add reset to AVD" into mnc-dev
ztenghui [Fri, 5 Jun 2015 22:57:12 +0000 (22:57 +0000)]
am 5dfe9d30: Merge "Add reset to AVD" into mnc-dev

* commit '5dfe9d30b4a5b765cc03907a4be30e2f7d013686':
  Add reset to AVD

9 years agoam 6f4610bd: Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev
Yang Ni [Fri, 5 Jun 2015 22:57:04 +0000 (22:57 +0000)]
am 6f4610bd: Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev

* commit '6f4610bdad3e270af59a8099970e8b40bf17f687':
  Fixed ScriptGroup for outputs to globals

9 years agoMerge "Add reset to AVD" into mnc-dev
ztenghui [Fri, 5 Jun 2015 22:46:47 +0000 (22:46 +0000)]
Merge "Add reset to AVD" into mnc-dev

9 years agoMerge "Fixed ScriptGroup for outputs to globals" into mnc-dev
Yang Ni [Fri, 5 Jun 2015 22:43:25 +0000 (22:43 +0000)]
Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev

9 years agoAdd reset to AVD
ztenghui [Fri, 5 Jun 2015 22:22:24 +0000 (15:22 -0700)]
Add reset to AVD

b/21664621

Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a

9 years agoam 64128563: Merge "Renaming carrier config variable keys." into mnc-dev
Jonathan Basseri [Fri, 5 Jun 2015 22:41:16 +0000 (22:41 +0000)]
am 64128563: Merge "Renaming carrier config variable keys." into mnc-dev

* commit '6412856358493455692955147991d858cfe16f80':
  Renaming carrier config variable keys.

9 years agoMerge "Renaming carrier config variable keys." into mnc-dev
Jonathan Basseri [Fri, 5 Jun 2015 22:29:47 +0000 (22:29 +0000)]
Merge "Renaming carrier config variable keys." into mnc-dev

9 years agoam c554b77b: Skip first frame for app transitions when possible
Jorim Jaggi [Fri, 5 Jun 2015 22:09:15 +0000 (22:09 +0000)]
am c554b77b: Skip first frame for app transitions when possible

* commit 'c554b77b7392b97e0f455d8276b739e16147d6df':
  Skip first frame for app transitions when possible

9 years agoRenaming carrier config variable keys.
Jonathan Basseri [Thu, 4 Jun 2015 20:48:08 +0000 (13:48 -0700)]
Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab

9 years agoSkip first frame for app transitions when possible
Jorim Jaggi [Thu, 4 Jun 2015 23:07:57 +0000 (16:07 -0700)]
Skip first frame for app transitions when possible

In most of our standard app transitions, the first frame of a
transition results in the same contents on the screen. This is
inefficient, as we can directly skip to the second frame of the
transition, introduce no jank, but execute the transition 16ms
faster.

Change-Id: If58337eae5558eae3acced691ae01c769f0ec2b9

9 years agoTIF: Convert fields to local variables
Jae Seo [Fri, 5 Jun 2015 21:43:11 +0000 (14:43 -0700)]
TIF: Convert fields to local variables

Change-Id: Ide6c5ad36229410f30f7929c6dd511945d48aa6f

9 years agoam a73c8b6f: Merge "add gps gid to system_server" into mnc-dev
Wei Wang [Fri, 5 Jun 2015 21:44:57 +0000 (21:44 +0000)]
am a73c8b6f: Merge "add gps gid to system_server" into mnc-dev

* commit 'a73c8b6fbf9ef2091db7300d0f290335024e4af5':
  add gps gid to system_server

9 years agoMerge "add gps gid to system_server" into mnc-dev
Wei Wang [Fri, 5 Jun 2015 21:34:00 +0000 (21:34 +0000)]
Merge "add gps gid to system_server" into mnc-dev

9 years agoam fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev
Makoto Onuki [Fri, 5 Jun 2015 21:32:49 +0000 (21:32 +0000)]
am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev

* commit 'fba7f5d73cce893860faa3af9df7b4099a8565a1':
  Fix crash on simplified Chinese.

9 years agoDon't run backups in battery-saver mode
Christopher Tate [Fri, 5 Jun 2015 21:17:43 +0000 (14:17 -0700)]
Don't run backups in battery-saver mode

Defer both full-data and key/value backups while in battery-saver mode.

Bug 21563473

Change-Id: I081b7bcd19af21a4c88ebb434d2d3ef4bc93951f

9 years agoadd gps gid to system_server
Kevin Tang [Tue, 23 Jul 2013 17:16:48 +0000 (10:16 -0700)]
add gps gid to system_server

system_server hosts gps service, it should pocess gps
gid, so it can communicate with native gps daemons.

Change-Id: I59d7e99ec996891b19fa15a3ed66e055e6bccad8

9 years agoMerge "Fix crash on simplified Chinese." into mnc-dev
Makoto Onuki [Fri, 5 Jun 2015 21:18:16 +0000 (21:18 +0000)]
Merge "Fix crash on simplified Chinese." into mnc-dev

9 years agoam 537bb5fc: Fix vibration for assist gesture
Jorim Jaggi [Fri, 5 Jun 2015 20:29:19 +0000 (20:29 +0000)]
am 537bb5fc: Fix vibration for assist gesture

* commit '537bb5fce785c3433540e047c0ccaae3b286f55e':
  Fix vibration for assist gesture

9 years agoam 3bb96c7b: Merge "Refinements for app transitions" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 20:29:13 +0000 (20:29 +0000)]
am 3bb96c7b: Merge "Refinements for app transitions" into mnc-dev

* commit '3bb96c7b3bbaa54f584ffff515f348178c79825e':
  Refinements for app transitions

9 years agoFix vibration for assist gesture
Jorim Jaggi [Fri, 5 Jun 2015 00:38:20 +0000 (17:38 -0700)]
Fix vibration for assist gesture

Bug: 21549531
Change-Id: I038dd29228646ce6d08da8543c59823cfbb21167

9 years agoMerge "Refinements for app transitions" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 20:19:35 +0000 (20:19 +0000)]
Merge "Refinements for app transitions" into mnc-dev

9 years agoam dfa4af2d: Merge "remove obsolete notification visibility log" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:16:01 +0000 (20:16 +0000)]
am dfa4af2d: Merge "remove obsolete notification visibility log" into mnc-dev

* commit 'dfa4af2dfafa6c99525ff5af8012f80dadb46e0a':
  remove obsolete notification visibility log

9 years agoam cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev
Adam Powell [Fri, 5 Jun 2015 20:15:56 +0000 (20:15 +0000)]
am cedc7b3b: Merge "Use real rounding in ImageView bounds configuration" into mnc-dev

* commit 'cedc7b3ba4449da497f9e81c66ff7700c2a364fc':
  Use real rounding in ImageView bounds configuration

9 years agoMerge "remove obsolete notification visibility log" into mnc-dev
Chris Wren [Fri, 5 Jun 2015 20:13:46 +0000 (20:13 +0000)]
Merge "remove obsolete notification visibility log" into mnc-dev

9 years agoremove obsolete notification visibility log
Chris Wren [Fri, 5 Jun 2015 20:12:18 +0000 (16:12 -0400)]
remove obsolete notification visibility log

Bug: 21248682
Change-Id: I8656a924514dd01ebc003f3cc81b1a9316919321

9 years agoMerge "Use real rounding in ImageView bounds configuration" into mnc-dev
Adam Powell [Fri, 5 Jun 2015 20:04:00 +0000 (20:04 +0000)]
Merge "Use real rounding in ImageView bounds configuration" into mnc-dev

9 years agoUpdate docs to reflect correct time units
Adam Lesinski [Fri, 5 Jun 2015 19:59:36 +0000 (12:59 -0700)]
Update docs to reflect correct time units

Change-Id: Id2757e45e989b148671cf83d51011984e07cd017

9 years agoam 8fa24e91: Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev
Amith Yamasani [Fri, 5 Jun 2015 18:46:19 +0000 (18:46 +0000)]
am 8fa24e91: Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev

* commit '8fa24e91c4dbe8a6533e99eeea4d8b200437d92a':
  Fix permission check in DPM.getPermissionGrantState

9 years agoRefinements for app transitions
Jorim Jaggi [Wed, 3 Jun 2015 00:07:39 +0000 (17:07 -0700)]
Refinements for app transitions

- Use refined interpolator for most of the transitions which respond
to touch faster than a normal fast_out_slow_in interpolator.
- Tune clip reveal animation: Get rid of horizontal movement, only do
slight vertical movement, and make horizontal reveal animation faster
so there is a more staggered animation to resemble an opening paper

Change-Id: Id94328906f9b194fb97d702e9b102c7aeef96bb8

9 years agoMerge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev
Amith Yamasani [Fri, 5 Jun 2015 18:36:06 +0000 (18:36 +0000)]
Merge "Fix permission check in DPM.getPermissionGrantState" into mnc-dev

9 years agoam 48cf298c: Merge "Change to hide BEARER_BITMASK." into mnc-dev
Amit Mahajan [Fri, 5 Jun 2015 18:32:41 +0000 (18:32 +0000)]
am 48cf298c: Merge "Change to hide BEARER_BITMASK." into mnc-dev

* commit '48cf298cb8ded48dbec8e977412815e61953b74f':
  Change to hide BEARER_BITMASK.

9 years agoam b1e0438c: Merge "add a log for notification alerts." into mnc-dev
Chris Wren [Fri, 5 Jun 2015 18:32:37 +0000 (18:32 +0000)]
am b1e0438c: Merge "add a log for notification alerts." into mnc-dev

* commit 'b1e0438ce316c95df2f08864f0c773d46f3f5e51':
  add a log for notification alerts.

9 years agoMerge "Change to hide BEARER_BITMASK." into mnc-dev
Amit Mahajan [Fri, 5 Jun 2015 18:24:03 +0000 (18:24 +0000)]
Merge "Change to hide BEARER_BITMASK." into mnc-dev

9 years agoMerge "add a log for notification alerts." into mnc-dev
Chris Wren [Fri, 5 Jun 2015 18:22:20 +0000 (18:22 +0000)]
Merge "add a log for notification alerts." into mnc-dev

9 years agoam 853cbe38: Don\'t play lock sound when just resetting Keyguard
Jorim Jaggi [Fri, 5 Jun 2015 18:19:59 +0000 (18:19 +0000)]
am 853cbe38: Don\'t play lock sound when just resetting Keyguard

* commit '853cbe38c9aa80671a2e7e616f48a6160c722eea':
  Don't play lock sound when just resetting Keyguard

9 years agoam 5f185270: Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 18:19:54 +0000 (18:19 +0000)]
am 5f185270: Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev

* commit '5f185270375e55a53ddb57982827ec0ac3edcf85':
  TIF: Add more explanation for notifyChannelRetuned

9 years agoDon't play lock sound when just resetting Keyguard
Jorim Jaggi [Thu, 4 Jun 2015 23:31:54 +0000 (16:31 -0700)]
Don't play lock sound when just resetting Keyguard

Bug: 21595440
Change-Id: I9bd470d051f4851dcde83099f1ba1f0a9bae429a

9 years agoam c3426128: Merge "TIF: Remove unused imports" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 18:06:43 +0000 (18:06 +0000)]
am c3426128: Merge "TIF: Remove unused imports" into mnc-dev

* commit 'c3426128fe2e263140f6977a0f28ba5bd3a7d906':
  TIF: Remove unused imports

9 years agoMerge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 18:05:32 +0000 (18:05 +0000)]
Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev

9 years agoMerge "TIF: Remove unused imports" into mnc-dev
Jae Seo [Fri, 5 Jun 2015 17:58:26 +0000 (17:58 +0000)]
Merge "TIF: Remove unused imports" into mnc-dev

9 years agoTIF: Remove unused imports
Jae Seo [Fri, 5 Jun 2015 17:51:52 +0000 (10:51 -0700)]
TIF: Remove unused imports

Change-Id: I1419a8e44d82fa009ccd6170d9048c3e24f51a2b

9 years agoadd a log for notification alerts.
Chris Wren [Fri, 5 Jun 2015 15:23:44 +0000 (11:23 -0400)]
add a log for notification alerts.

Bug: 21242827
Change-Id: I1b8beee5cc12a9cd23e81554f7f2236ddc29e2b6

9 years agoFix crash on simplified Chinese.
Makoto Onuki [Thu, 4 Jun 2015 23:38:48 +0000 (16:38 -0700)]
Fix crash on simplified Chinese.

They use the standard A/B sizes in China too.

Bug 20340812

Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966

9 years agoam 4034e0ec: Merge "Fix inverse subhead color" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:39:49 +0000 (17:39 +0000)]
am 4034e0ec: Merge "Fix inverse subhead color" into mnc-dev

* commit '4034e0ecc30f0c198e308cd6c7b7eb121b9f9c2b':
  Fix inverse subhead color

9 years agoTIF: Add more explanation for notifyChannelRetuned
Jae Seo [Fri, 5 Jun 2015 17:34:20 +0000 (10:34 -0700)]
TIF: Add more explanation for notifyChannelRetuned

Bug: 21277081
Change-Id: Ia4de27bc0ecdf49bcad83cfcd396e8d55dc8343a

9 years agoMerge "Fix inverse subhead color" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:29:39 +0000 (17:29 +0000)]
Merge "Fix inverse subhead color" into mnc-dev

9 years agoam a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:27:24 +0000 (17:27 +0000)]
am a06b41b0: Merge "Avoid NPE when drawable fails to load" into mnc-dev

* commit 'a06b41b06e5bbcf5bf02741a765ebad5367c14de':
  Avoid NPE when drawable fails to load

9 years agoam 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewpo...
Alan Viverette [Fri, 5 Jun 2015 17:27:18 +0000 (17:27 +0000)]
am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev

* commit '42cc892be135ed5be6f98f5f70bb6739bfaecaad':
  Account for margins in ScrollView onMeasure() when filling viewport

9 years agoFix inverse subhead color
Alan Viverette [Fri, 5 Jun 2015 17:26:03 +0000 (10:26 -0700)]
Fix inverse subhead color

Bug: 21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264

9 years agoMerge "Avoid NPE when drawable fails to load" into mnc-dev
Alan Viverette [Fri, 5 Jun 2015 17:19:30 +0000 (17:19 +0000)]
Merge "Avoid NPE when drawable fails to load" into mnc-dev

9 years agoMerge "Account for margins in ScrollView onMeasure() when filling viewport" into...
Alan Viverette [Fri, 5 Jun 2015 17:18:45 +0000 (17:18 +0000)]
Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev

9 years agoAvoid NPE when drawable fails to load
Alan Viverette [Fri, 5 Jun 2015 17:17:21 +0000 (10:17 -0700)]
Avoid NPE when drawable fails to load

Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c

9 years agoam eb974d5a: Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev
Filip Gruszczynski [Fri, 5 Jun 2015 17:09:20 +0000 (17:09 +0000)]
am eb974d5a: Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev

* commit 'eb974d5ac4b8733e4788066ec9ac6cf2bfb75c9b':
  More inclusive rules for using outsets.

9 years agoMerge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev
Filip Gruszczynski [Fri, 5 Jun 2015 16:59:44 +0000 (16:59 +0000)]
Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev

9 years agoam e1352de6: Merge "Setup the animation callback for AnimatedVectorDrawable" into...
ztenghui [Fri, 5 Jun 2015 16:51:05 +0000 (16:51 +0000)]
am e1352de6: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev

* commit 'e1352de673423264c00c71c0ec1597bbdad6fd03':
  Setup the animation callback for AnimatedVectorDrawable

9 years agoresolved conflicts for merge of f6a04305 to mnc-dev
Filip Gruszczynski [Fri, 5 Jun 2015 16:43:06 +0000 (09:43 -0700)]
resolved conflicts for merge of f6a04305 to mnc-dev

Change-Id: I92e666bfd6d8ad051bdee7dce5712b9cb8e6a01d

9 years agoMerge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:37:09 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev

9 years agoam 3e85c1ed: Merge "Fix Select All should not be shown when everything is already...
Clara Bayarri [Fri, 5 Jun 2015 16:31:57 +0000 (16:31 +0000)]
am 3e85c1ed: Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev

* commit '3e85c1ed0cce70164dfe6f8ffa4bf3695c4ce0ba':
  Fix Select All should not be shown when everything is already selected

9 years agoMerge "Fix Select All should not be shown when everything is already selected" into...
Clara Bayarri [Fri, 5 Jun 2015 16:19:29 +0000 (16:19 +0000)]
Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev

9 years agoam 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev
Mady Mellor [Fri, 5 Jun 2015 16:01:06 +0000 (16:01 +0000)]
am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev

* commit '0f2f9f7a51a43ef8ca1d977f62cf649d08d6ec84':
  Stylus scale - API review feedback

9 years agoUse real rounding in ImageView bounds configuration
Adam Powell [Thu, 4 Jun 2015 19:56:00 +0000 (12:56 -0700)]
Use real rounding in ImageView bounds configuration

While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304

9 years agoMerge "Stylus scale - API review feedback" into mnc-dev
Mady Mellor [Fri, 5 Jun 2015 15:50:48 +0000 (15:50 +0000)]
Merge "Stylus scale - API review feedback" into mnc-dev

9 years agoam e790c977: Hide View.getBackgroundColor() prior to removal
Chet Haase [Fri, 5 Jun 2015 14:55:27 +0000 (14:55 +0000)]
am e790c977: Hide View.getBackgroundColor() prior to removal

* commit 'e790c97787dbc05930ad0c4a708fad7cd7d3f2b9':
  Hide View.getBackgroundColor() prior to removal

9 years agoHide View.getBackgroundColor() prior to removal
Chet Haase [Thu, 4 Jun 2015 21:01:29 +0000 (14:01 -0700)]
Hide View.getBackgroundColor() prior to removal

Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69

9 years agoam 44fdcf26: Merge "Update no wifi networks string" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 14:31:57 +0000 (14:31 +0000)]
am 44fdcf26: Merge "Update no wifi networks string" into mnc-dev

* commit '44fdcf26421c4c2a59888739fa003a14e09e8391':
  Update no wifi networks string

9 years agoMerge "Update no wifi networks string" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 14:22:15 +0000 (14:22 +0000)]
Merge "Update no wifi networks string" into mnc-dev

9 years agoUpdate no wifi networks string
Jason Monk [Fri, 5 Jun 2015 14:15:02 +0000 (10:15 -0400)]
Update no wifi networks string

Bug: 21530009
Change-Id: I910b2c062252c69f71e29744f6029c6e2557947d

9 years agoam e067ff43: Merge "Removed Log message when expanding from HUN" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
am e067ff43: Merge "Removed Log message when expanding from HUN" into mnc-dev

* commit 'e067ff4357f0990cc96996a50b24e41c94c5d287':
  Removed Log message when expanding from HUN

9 years agoam 1ceee65c: Merge "Removed the arrow from the hint animation" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:36:19 +0000 (13:36 +0000)]
am 1ceee65c: Merge "Removed the arrow from the hint animation" into mnc-dev

* commit '1ceee65c20426ee4da721ea8c21fe62c66c718ed':
  Removed the arrow from the hint animation

9 years agoam c699b871: Merge "Fixed a bug with HUNS and dreams" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:36:02 +0000 (13:36 +0000)]
am c699b871: Merge "Fixed a bug with HUNS and dreams" into mnc-dev

* commit 'c699b8713080e73be7e479530ea38bf06d0882bb':
  Fixed a bug with HUNS and dreams

9 years agoMerge "Removed Log message when expanding from HUN" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:29:34 +0000 (13:29 +0000)]
Merge "Removed Log message when expanding from HUN" into mnc-dev

9 years agoMerge "Removed the arrow from the hint animation" into mnc-dev
Selim Cinek [Fri, 5 Jun 2015 13:28:55 +0000 (13:28 +0000)]
Merge "Removed the arrow from the hint animation" into mnc-dev