137184 Commits

Author SHA1 Message Date
Baligh Uddin
98b920a8b6 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:10 +00:00
Baligh Uddin
3c7b7e8179 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:07 +00:00
Baligh Uddin
0b30206fe5 Merge "Import translations. DO NOT MERGE" 2014-05-27 17:28:02 +00:00
Baligh Uddin
6160ff0e9f Merge "Import translations. DO NOT MERGE" 2014-05-27 17:27:58 +00:00
ztenghui
6d9c422de5 Bring the group tag back to VectorDrawable.
This is the first step, including:
1. Bring the group tag back by reverting.
2. If there is no group tag, then treat all the paths as a single group.
Make sure our test cases covering both cases.

At the same time, fix one tiny UI bug in the test.

TODO:
1. Move the rotation to the group tag.
2. Add translation/scale to the group tag.
3. Convert the group into a tree hierarchy.

This reverts commit 404211630ba3bb865109434aba4433e7541b39d3.

Conflicts:
	graphics/java/android/graphics/drawable/VectorDrawable.java

Change-Id: Ife65bb6a7fc85f9947124b8e356cd5b82119796a
2014-05-27 10:15:52 -07:00
Winson Chung
826ee9eca3 am e5ecd6f8: (-s ours) Merge "DO NOT MERGE " into lmp-preview-dev
* commit 'e5ecd6f89645af869e647c1a4d84597a67445780':
  DO NOT MERGE
2014-05-27 17:13:03 +00:00
John Spurlock
95caba1270 frameworks/base: Performance tweaks for SeekBarVolumizer.
Move ringtone init to the worker thread.  Allow the volumizer
instance to be reused by making the seekbar settable.

Bug:15091992
Change-Id: Ib616ae0fbb9a45c63391f8335e48ec2754dbdcd5
2014-05-27 13:10:38 -04:00
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00
Winson Chung
8f4f2ff5cb Merge "DO NOT MERGE " into lmp-preview-dev 2014-05-27 17:07:10 +00:00
Leon Scroggins III
43e11eca16 Merge "Fix FILTER_BITMAP_FLAG regression in DrawFilter." 2014-05-27 17:01:24 +00:00
Craig Mautner
c40e7dc4fc Merge "resolved conflicts for merge of 754a8c4c to master" 2014-05-27 16:42:39 +00:00
Craig Mautner
39c1f59541 resolved conflicts for merge of 754a8c4c to master
Change-Id: I750b714248486eb8609951caa10be7a543f624da
2014-05-27 09:41:52 -07:00
Craig Mautner
667c77e419 am 0b6c8f59: (-s ours) Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev
* commit '0b6c8f599cf33abfe9cd3fe5ea8d0411bbb475c2':
  Do not start tasks on ActivityViews unless explicit. DO NOT MERGE
2014-05-27 16:40:59 +00:00
Craig Mautner
c752919c7c Merge "Do not start tasks on ActivityViews unless explicit. DO NOT MERGE" into lmp-preview-dev 2014-05-27 16:37:45 +00:00
Craig Mautner
b539b3aafb Do not start tasks on ActivityViews unless explicit. DO NOT MERGE
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-05-27 09:22:55 -07:00
Craig Mautner
754a8c4c95 am 1b4bf857: Do not start tasks on ActivityViews unless explicit
* commit '1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
  Do not start tasks on ActivityViews unless explicit
2014-05-27 16:22:39 +00:00
Craig Mautner
1b4bf857d3 Do not start tasks on ActivityViews unless explicit
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.

Fixes bug 15162447.

Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
2014-05-27 09:19:28 -07:00
Craig Mautner
bcede43413 am b984a072: Merge "Add more error checking to xml restore" into lmp-preview-dev
* commit 'b984a072a7addc2404ea9ae2f67ccfa85e686167':
  Add more error checking to xml restore
2014-05-27 16:16:47 +00:00
Leon Scroggins III
5f6aa983d6 Fix FILTER_BITMAP_FLAG regression in DrawFilter.
Skia removed the corresponding kFilterBitmapFlag, replacing it with a
separate function: setFilterLevel. If the flag is set, turn it into a
call to setFilterLevel.

Corresponds to changes in I2736f3f68683651574d79a169ff0ab563e0a469e to
fix Paint.setFlags().

BUG:15112859
Change-Id: I269cbd7a624e5dde5688305e1ba97075ba73f4fd
2014-05-27 12:15:32 -04:00
Craig Mautner
5d0045835b Merge "Add more error checking to xml restore" into lmp-preview-dev 2014-05-27 16:13:28 +00:00
ztenghui
9d8ef24cbb am 48454e7f: (-s ours) Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev
* commit '48454e7f16b7cca7989b377f608227b6ed8c9ced':
  DO NOT MERGE: Hide the VectorDrawable
2014-05-27 16:12:48 +00:00
ztenghui
427a15a0f0 Merge "DO NOT MERGE: Hide the VectorDrawable" into lmp-preview-dev 2014-05-27 16:09:05 +00:00
Narayan Kamath
96132a1907 Build PacProcessor for 64 bit.
external/chromium-libpac can now build for 64 bit.

Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
2014-05-27 17:06:18 +01:00
Eric Laurent
a198a29250 AudioManager: audio routing extensions
Added API and classes allowing framework components
to have direct control over audio routing and volumes.

Change-Id: I28225a6ebad86a7836e1ed749d93c0e964e215f1
2014-05-27 08:46:56 -07:00
Adrian Roos
76ce460f70 am da1d6c3c: Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev
* commit 'da1d6c3c8a7e80fce5d0e1f3552ccd1f22039e47':
  Initialize background visibility of ActivatableNotificationView
2014-05-27 15:39:28 +00:00
Adrian Roos
a33ea18dc6 Merge "Initialize background visibility of ActivatableNotificationView" into lmp-preview-dev 2014-05-27 15:37:38 +00:00
John Spurlock
1285b95173 am 3bfd2404: (-s ours) Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev
* commit '3bfd24041ae8cb9adbe1f8f54792e0bebe33a3be':
  DO NOT MERGE Hide vibrator streamHint overloads for preview.
2014-05-27 15:16:40 +00:00
John Spurlock
fc9e1e0592 Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev 2014-05-27 15:13:34 +00:00
Christoph Studer
711259a9e4 NoMan: Disable SQLite log DO NOT MERGE
Bug: 15279504
Change-Id: I76f9283675537607729ed450471ef4b1d9ec3898
2014-05-27 16:56:47 +02:00
Christoph Studer
05e2884972 NoMan: Allow disabling SQLiteLog.
Bug: 15279504
Change-Id: I561391a312f88a7d5e11b180984f18bb1d3dcda0
2014-05-27 16:55:57 +02:00
Paul Jensen
2615fd48a0 Adjust Network's SocketFactory to restrict host name resolution to that Network
Change-Id: Iab9a5a2e060fe261f4be9ba974c1a55fb6b9c98b
2014-05-27 10:49:34 -04:00
Yohei Yukawa
c997ca0b68 Merge "Switch back to StaticRotationList from DynamicRotationList" 2014-05-27 14:41:25 +00:00
Adrian Roos
bcbb75ac9d Initialize background visibility of ActivatableNotificationView
Initializes the background visibilities that were previously
only set when adding the view to the scroller,
resulting in HUNs having two backgrounds.

Bug: 15106201
Change-Id: I21ef3b34c6feb0e852c9dc2c3289665cff40927e
2014-05-27 16:39:53 +02:00
Craig Mautner
10bfef0bb8 am 4c5309fb: Merge changes I88865c02,I34cc1310 into lmp-preview-dev
* commit '4c5309fb3b0abfc86fdfad9844ce20e2df03497b':
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:28:15 +00:00
Craig Mautner
5122fb6a92 am 463f9006: Merge "Only start TaskPersister once." into lmp-preview-dev
* commit '463f9006c56d66b5213edecc150863b450a7e573':
  Only start TaskPersister once.
2014-05-27 14:28:10 +00:00
Craig Mautner
b45a730efb Merge changes I88865c02,I34cc1310 into lmp-preview-dev
* changes:
  Check for null DO NOT MERGE
  Improve DocCentric documentation. DO NOT MERGE
2014-05-27 14:24:04 +00:00
John Spurlock
53bd26335c am c5890bb9: Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev
* commit 'c5890bb9c2361adf64efa7a2680536edaa527d1f':
  VolumeZen: combine ringer/notification volume and zen.
2014-05-27 14:23:40 +00:00
Craig Mautner
e88d180d6c am e2c92ac8: Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev
* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
  Update launchFlags after changing Intent flags
2014-05-27 14:23:35 +00:00
Adrian Roos
83ea195b8a am 756bfbce: Merge "Make carrier label single line with marquee on overflow" into lmp-preview-dev
* commit '756bfbcec68d9f1087e517f4fc5574f6b61d5727':
  Make carrier label single line with marquee on overflow
2014-05-27 14:23:30 +00:00
Craig Mautner
8aa29921df Merge "Only start TaskPersister once." into lmp-preview-dev 2014-05-27 14:22:04 +00:00
Chris Wren
fb69da323b Reduce logspam by catching unexpected types ourselves.
Also fix a bug in the conversion of ArrayLists to String[].

Change-Id: I839c80d0b571be298062d511dd3c83cc1e263f54
2014-05-27 10:19:07 -04:00
John Spurlock
6940b361e5 Merge "VolumeZen: combine ringer/notification volume and zen." into lmp-preview-dev 2014-05-27 14:16:52 +00:00
Craig Mautner
bf1bf9dea7 Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev 2014-05-27 14:14:34 +00:00
John Spurlock
8600534df6 VolumeZen: combine ringer/notification volume and zen.
- Implement a new volume panel widget, combining volume and
  zen mode + conditions.
- Show zen mode + conditions when modifying ringer or notification
  streams.
- Host the volume panel widget in a dialog when being controlled
  by the audio service / volume keys.
- Remove support for multiple sliders in the volume panel.
- Remove support for separate ringer + notification volumes
  in the volume panel.
- Move volume panel resources up to SystemUI.
- Create a new combined Notifications quick settings tile.
- Host the volume panel widget in the quick settings panel under
  Notifications.
- When the quick settings detail panel is visible, route the volume
  keys to the embedded widget instead of showing a redundant dialog.
- Create common styles for quick settings text to be closer to spec.
- Update the framework resources for the ringer stream.
- Show the ringer icons in global actions.
- Add "until you turn this off" back as a separate zen condition.
- Disable time condition buttons when they are N/A.
- Don't allow volume changes to set ringer mode silent.

Bug:15186070
Change-Id: Id5e321dd1d5e7c4cf3917027ffbdf7e80d38b00d
2014-05-27 10:08:00 -04:00
Craig Mautner
e0129b3c67 Add more error checking to xml restore
Bad files and OS updates can cause the restore to throw an NPE.
Rather than bring down the server process over this, just delete
the persistent file and keep going.

Fixes bug 15219594.

Change-Id: Id9cd39988ff93a26def036a05c46209364f2a4c0
2014-05-27 06:56:44 -07:00
Adrian Roos
1a7da57fa9 Merge "Make carrier label single line with marquee on overflow" into lmp-preview-dev 2014-05-27 13:07:00 +00:00
Yohei Yukawa
529001f067 Switch back to StaticRotationList from DynamicRotationList
Ic005b94379f9d847ea, which introduced DynamicRotationList for
smarter input method rotation, is suspected to be causing a
strange behavior that InputMethodManager#switchToNextInputMethod
is choosing unexected/disabled IME/subtype.

With this CL, we switch back to StaticRotationList until the root
cause is addressed.

BUG: 7043015
Change-Id: I95fc8b28536cea6d09ea325e0caee14007cfc0a7
2014-05-27 20:32:34 +09:00
Narayan Kamath
2416768ae4 am eae7b53d: am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit 'eae7b53d3aa78da9b1b9a76e801bb680a8841091':
  PacProccesor: Only build for 32-bit
2014-05-27 11:09:42 +00:00
Narayan Kamath
eae7b53d3a am 34c6cb4c: am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit '34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
  PacProccesor: Only build for 32-bit
2014-05-27 11:06:03 +00:00
Narayan Kamath
34c6cb4c1a am 6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit '6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
  PacProccesor: Only build for 32-bit
2014-05-27 11:00:48 +00:00