OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException.""
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:47:42 +0000 (04:47 +0000)]
Merge "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException.""

8 years agoRevert "Remove the flag and make openTypedDocument throw FileNotFoundException."
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:47:03 +0000 (04:47 +0000)]
Revert "Remove the flag and make openTypedDocument throw FileNotFoundException."

This reverts commit 95149ab6a5442a05f05f448854b6ab386c87f717.

Change-Id: I218aa8059ef674400dac8531a86cd326748c26d5

8 years agoRevert "Update APIs for the flag changes in SAF."
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:44:19 +0000 (04:44 +0000)]
Revert "Update APIs for the flag changes in SAF."

This reverts commit e7decfb815342dbea00b305a52b1178e2d646df1.

Change-Id: I023989381ffa7296db7a21ec01327a32b3f16c4f

8 years agoUpdate APIs for the flag changes in SAF.
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:36:12 +0000 (15:36 +1100)]
Update APIs for the flag changes in SAF.

Bug: 26222645
Change-Id: I7189b7867ad31dbd7e3f768387e2f570a41527b1

8 years agoMerge "Add missing style change to android_mtp_MtpDevice.cpp."
Daichi Hirono [Thu, 7 Jan 2016 04:11:00 +0000 (04:11 +0000)]
Merge "Add missing style change to android_mtp_MtpDevice.cpp."

8 years agoAdd missing style change to android_mtp_MtpDevice.cpp.
Daichi Hirono [Thu, 7 Jan 2016 04:06:11 +0000 (13:06 +0900)]
Add missing style change to android_mtp_MtpDevice.cpp.

BUG=26284424

Change-Id: I0e288712a8fccfb3dd21fa927388bacf5ce155d0

8 years agoMerge "Remove the flag and make openTypedDocument throw FileNotFoundException."
Tomasz Mikolajewski [Thu, 7 Jan 2016 03:52:01 +0000 (03:52 +0000)]
Merge "Remove the flag and make openTypedDocument throw FileNotFoundException."

8 years agoRemove the flag and make openTypedDocument throw FileNotFoundException.
Tomasz Mikolajewski [Thu, 24 Dec 2015 04:24:00 +0000 (13:24 +0900)]
Remove the flag and make openTypedDocument throw FileNotFoundException.

To be compatible with ContentProvider, DocumentsProvider should not
require checking for a flag before calling openTypedAssetFile.

This CL removes the flag, and makes the default implementation throw
FileNotFoundException instead.

Bug: 26222645
Change-Id: I3492f05804e39583ebb8584109c7017b3082846e

8 years agoMerge "Add getPartialObject to Java MtpDevice class."
Daichi Hirono [Thu, 7 Jan 2016 03:49:02 +0000 (03:49 +0000)]
Merge "Add getPartialObject to Java MtpDevice class."

8 years agoAdd getPartialObject to Java MtpDevice class.
Daichi Hirono [Thu, 24 Dec 2015 08:52:10 +0000 (17:52 +0900)]
Add getPartialObject to Java MtpDevice class.

BUG=26284424

Change-Id: Id05dc6297a1682999eee4e72972fb883fa49a5d1

8 years agoMerge "Grant location to SetupWizard by default - framework"
Svetoslav Ganov [Thu, 7 Jan 2016 03:37:21 +0000 (03:37 +0000)]
Merge "Grant location to SetupWizard by default - framework"

8 years agoMerge "Fix IMM#showInputMethodAndSubtypeEnabler()."
Yohei Yukawa [Thu, 7 Jan 2016 01:29:05 +0000 (01:29 +0000)]
Merge "Fix IMM#showInputMethodAndSubtypeEnabler()."

8 years agoMerge "Implement FUSE operations in AppFuse JNI."
Daichi Hirono [Thu, 7 Jan 2016 01:21:07 +0000 (01:21 +0000)]
Merge "Implement FUSE operations in AppFuse JNI."

8 years agoMerge "Leave from the current root when the root is removed."
Daichi Hirono [Thu, 7 Jan 2016 01:18:34 +0000 (01:18 +0000)]
Merge "Leave from the current root when the root is removed."

8 years agoMerge "Add some TestApis to fix build."
Jeff Sharkey [Thu, 7 Jan 2016 00:41:45 +0000 (00:41 +0000)]
Merge "Add some TestApis to fix build."

8 years agoMerge "Don't depend on mContentParent to determine if content was set."
Filip Gruszczynski [Thu, 7 Jan 2016 00:40:55 +0000 (00:40 +0000)]
Merge "Don't depend on mContentParent to determine if content was set."

8 years agoMerge "AAPT2: Fix product support"
Adam Lesinski [Thu, 7 Jan 2016 00:40:36 +0000 (00:40 +0000)]
Merge "AAPT2: Fix product support"

8 years agoAdd some TestApis to fix build.
Jeff Sharkey [Thu, 7 Jan 2016 00:02:08 +0000 (17:02 -0700)]
Add some TestApis to fix build.

Change-Id: Icf0d8d63f3a41d99e46ebe96003863bae637bd9d

8 years agoMerge "Improved output for 'dumpsys window displays'"
Wale Ogunwale [Thu, 7 Jan 2016 00:32:40 +0000 (00:32 +0000)]
Merge "Improved output for 'dumpsys window displays'"

8 years agoAAPT2: Fix product support
Adam Lesinski [Wed, 6 Jan 2016 23:45:28 +0000 (15:45 -0800)]
AAPT2: Fix product support

Previously the default product wasn't tried if 'default' wasn't specified on the command line.
Also adds support for multiple products.

Change-Id: I1e4872b34bb8d609b6444841a4e7e4dbb3bbb76b

8 years agoMerge "New regular expression to autolink URLs"
Siyamed Sinir [Thu, 7 Jan 2016 00:14:26 +0000 (00:14 +0000)]
Merge "New regular expression to autolink URLs"

8 years agoMerge "AAPT2: Port AAPT pseudolocalization to AAPT2"
Adam Lesinski [Wed, 6 Jan 2016 23:55:06 +0000 (23:55 +0000)]
Merge "AAPT2: Port AAPT pseudolocalization to AAPT2"

8 years agoMerge "AAPT2: Fix references to private parent"
Adam Lesinski [Wed, 6 Jan 2016 23:50:50 +0000 (23:50 +0000)]
Merge "AAPT2: Fix references to private parent"

8 years agoMerge "AAPT2: Respect format attribute of <item> tag"
Adam Lesinski [Wed, 6 Jan 2016 23:50:10 +0000 (23:50 +0000)]
Merge "AAPT2: Respect format attribute of <item> tag"

8 years agoMerge "Rework op macros"
Chris Craik [Wed, 6 Jan 2016 22:42:31 +0000 (22:42 +0000)]
Merge "Rework op macros"

8 years agoMerge "Fix wrong annotation for PrintInfo.Builder.setStatus"
Philip P. Moltmann [Wed, 6 Jan 2016 22:35:35 +0000 (22:35 +0000)]
Merge "Fix wrong annotation for PrintInfo.Builder.setStatus"

8 years agoDon't depend on mContentParent to determine if content was set.
Filip Gruszczynski [Wed, 6 Jan 2016 22:34:00 +0000 (14:34 -0800)]
Don't depend on mContentParent to determine if content was set.

mContentParent might be set due to window preservation, rather than due
to client setting the content view. We should mark the content view as
set only when it's explicitly done.

Bug: 26345798
Change-Id: I749de9def8ff708592fa20abdb7da366ec52f24d

8 years agoMerge "Consistent naming for PackageManager methods."
Jeff Sharkey [Wed, 6 Jan 2016 22:26:16 +0000 (22:26 +0000)]
Merge "Consistent naming for PackageManager methods."

8 years agoConsistent naming for PackageManager methods.
Jeff Sharkey [Wed, 6 Jan 2016 21:51:50 +0000 (14:51 -0700)]
Consistent naming for PackageManager methods.

When hidden PackageManager methods take a userId argument, they
should be named explicitly with the "AsUser" suffix.  This fixes
several lagging examples so that we can pave the way to safely
start passing flags to new methods without scary overloading.

Also fix spacing issues in various logging statements.

Change-Id: I1e42f7f66427410275df713bea04f6e0445fba28

8 years agoRework op macros
Chris Craik [Wed, 6 Jan 2016 21:46:52 +0000 (13:46 -0800)]
Rework op macros

Makes it simpler to add defer-only or render-only opps.

Change-Id: I6c8ec64e76d419635429055cff6d96360d21706d

8 years agoMerge "[WindowManagerService] fix starting window issue"
Wale Ogunwale [Wed, 6 Jan 2016 22:02:24 +0000 (22:02 +0000)]
Merge "[WindowManagerService] fix starting window issue"

8 years agoExit getAllValidScorers early if not the primary. am: 5b294b45d0 am: 2a5f880c9e
Jeremy Joslin [Wed, 6 Jan 2016 21:52:43 +0000 (21:52 +0000)]
Exit getAllValidScorers early if not the primary. am: 5b294b45d0 am: 2a5f880c9e
am: 0807537ac2

* commit '0807537ac25bb0557a009e64eb1e399296c7531b':
  Exit getAllValidScorers early if not the primary.

8 years agoMerge "Update logic for resolving verifiers."
Jeff Sharkey [Wed, 6 Jan 2016 21:50:06 +0000 (21:50 +0000)]
Merge "Update logic for resolving verifiers."

8 years agoExit getAllValidScorers early if not the primary. am: 5b294b45d0
Jeremy Joslin [Wed, 6 Jan 2016 21:48:30 +0000 (21:48 +0000)]
Exit getAllValidScorers early if not the primary. am: 5b294b45d0
am: 2a5f880c9e

* commit '2a5f880c9e3c14c5e3421259f7904d9c352f79dc':
  Exit getAllValidScorers early if not the primary.

8 years agoMerge "Switch to smooth scrolling when zooming to home/end."
Ben Kwa [Wed, 6 Jan 2016 21:44:43 +0000 (21:44 +0000)]
Merge "Switch to smooth scrolling when zooming to home/end."

8 years agoExit getAllValidScorers early if not the primary.
Jeremy Joslin [Wed, 6 Jan 2016 21:43:24 +0000 (21:43 +0000)]
Exit getAllValidScorers early if not the primary.
am: 5b294b45d0

* commit '5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76':
  Exit getAllValidScorers early if not the primary.

8 years agoMerge "QS Customize panel cleanup"
Jason Monk [Wed, 6 Jan 2016 21:43:13 +0000 (21:43 +0000)]
Merge "QS Customize panel cleanup"

8 years agoFix wrong annotation for PrintInfo.Builder.setStatus
Philip P. Moltmann [Wed, 6 Jan 2016 17:34:00 +0000 (09:34 -0800)]
Fix wrong annotation for PrintInfo.Builder.setStatus

Change-Id: I11fd68497c6229d16c0827f4753f485e9095649d

8 years agoSwitch to smooth scrolling when zooming to home/end.
Ben Kwa [Mon, 30 Nov 2015 22:39:31 +0000 (14:39 -0800)]
Switch to smooth scrolling when zooming to home/end.

Smooth scrolling fires off a full complement of scroll state changes,
which enables the code to more accurately detect when a scroll is
finished.

BUG=24865658,25632648

Change-Id: Ib902836fdb4a76612d3bbfc4d30d5b0b249301a5

8 years agoMerge "Some fixes for docking from navigation bar use case"
Chong Zhang [Wed, 6 Jan 2016 21:36:29 +0000 (21:36 +0000)]
Merge "Some fixes for docking from navigation bar use case"

8 years agoGrant location to SetupWizard by default - framework
Svetoslav Ganov [Wed, 6 Jan 2016 21:33:30 +0000 (13:33 -0800)]
Grant location to SetupWizard by default - framework

bug:24914976

Change-Id: I1eaf14fa1e146f0cf1821352eebd2f318d839d5a

8 years agoQS Customize panel cleanup
Jason Monk [Wed, 6 Jan 2016 21:32:29 +0000 (16:32 -0500)]
QS Customize panel cleanup

 - Use better service management to ensure onTileAdded and onTileRemoved
   are sent.
 - Fix not always registered as tunable bug.

Bug: 26423350
Change-Id: I56156de8e0edf903509dac594b471700068ebe3e

8 years agoSome fixes for docking from navigation bar use case
Chong Zhang [Tue, 5 Jan 2016 21:42:44 +0000 (13:42 -0800)]
Some fixes for docking from navigation bar use case

- Do not set replace window if we are keeping the window.

- After we received the app's addWindow request, do a reset of the
timeout timer to give the app more time to finish drawing. This
reduces the chance of the flash due to the old window being removed
before new window is drawn.

- If we really hit timeout limit, make sure the replaced window
is removed by using removeWindowInnerLocked(), not removeWindowLocked().
The latter does not actually remove the window if it's exiting,
and this leaves the window in the stack and marked not for
for replacing, then it can never be removed.

bug: 26324082

Change-Id: I59594798079481cba9490c4754de1b16533e72fe

8 years agoMerge "Reinstate mime icons on grid tiles."
Ben Kwa [Wed, 6 Jan 2016 21:13:29 +0000 (21:13 +0000)]
Merge "Reinstate mime icons on grid tiles."

8 years agoImproved output for 'dumpsys window displays'
Wale Ogunwale [Wed, 6 Jan 2016 20:36:34 +0000 (12:36 -0800)]
Improved output for 'dumpsys window displays'

New format makes it easier to parse during CTS testing.

Bug: 19225708
Change-Id: Ia9a75ca92b6c10eefcb07cabea9852e514807b08

8 years agoUpdate logic for resolving verifiers.
Jeff Sharkey [Wed, 6 Jan 2016 19:26:11 +0000 (12:26 -0700)]
Update logic for resolving verifiers.

Verifiers or installers may not be encryption-aware, or the user may
have disabled them, so we probe pretty deeply during system boot to
resolve them.  Use the new MATCH_SYSTEM_ONLY flag to limit results to
packages on the system image.

When there are multiple matches, pick the one with highest priority
instead of crashing the system.

Switch to updated MATCH_ constants in more places.

Bug: 26250295
Change-Id: Ia7a3b1fb74da6c3b9d2c2edbf1deaa9fb52fc40a

8 years agoMerge "Cache XML blocks against file name rather than resource ID"
Alan Viverette [Wed, 6 Jan 2016 20:36:05 +0000 (20:36 +0000)]
Merge "Cache XML blocks against file name rather than resource ID"

8 years ago[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
Tyler Gunn [Wed, 6 Jan 2016 20:31:00 +0000 (20:31 +0000)]
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
am: ae85bc3c65  -s ours

* commit 'ae85bc3c65b33b8b00b610246e41e282d16605b9':
  [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.

8 years agoMerge "Clean up asset manager package-private methods"
Alan Viverette [Wed, 6 Jan 2016 20:29:49 +0000 (20:29 +0000)]
Merge "Clean up asset manager package-private methods"

8 years agoMerge "Skip the cache when loading drawables from a foreign density"
Alan Viverette [Wed, 6 Jan 2016 20:29:19 +0000 (20:29 +0000)]
Merge "Skip the cache when loading drawables from a foreign density"

8 years agoCache XML blocks against file name rather than resource ID
Alan Viverette [Wed, 6 Jan 2016 20:27:35 +0000 (15:27 -0500)]
Cache XML blocks against file name rather than resource ID

Caching against resource ID leads to incorrect cache hits, since multiple
files (ex. within drawable-mdpi, drawable-ldpi) may map to the same ID.

Also adds nullability annotations.

Bug: 26400880
Change-Id: I4d83caf3c44dc9b546511753e9e72171e8850eb2

8 years agoMerge "[WindowManagerService] fix starting window issue" am: 8683f1b160
Wale Ogunwale [Wed, 6 Jan 2016 20:27:04 +0000 (20:27 +0000)]
Merge "[WindowManagerService] fix starting window issue" am: 8683f1b160
am: a7582b55e7  -s ours

* commit 'a7582b55e789f76fa18364950a93193ba7c0b2dd':
  [WindowManagerService] fix starting window issue

8 years agoReinstate mime icons on grid tiles.
Ben Kwa [Wed, 6 Jan 2016 20:10:18 +0000 (12:10 -0800)]
Reinstate mime icons on grid tiles.

- Add code to restore the mime icon on grid tiles (previously removed
  while tile layouts were being worked on).

- Switch mime icons from pngs to vector drawables.

BUG=24326989

Change-Id: I38b54256c6eca79052decadb6d138f658d03b951

8 years agoAAPT2: Port AAPT pseudolocalization to AAPT2
Adam Lesinski [Thu, 17 Dec 2015 21:03:11 +0000 (13:03 -0800)]
AAPT2: Port AAPT pseudolocalization to AAPT2

Pseudolocalization happens at the compile phase. Pseudolocalized
values are weak, such that manually specified values will take precedence.

Change-Id: I5e064ce0d270c9f4f9022f75aecedab9d45bc980

8 years agoMerge "More logging for ANR track-down"
Rob Carr [Wed, 6 Jan 2016 19:36:13 +0000 (19:36 +0000)]
Merge "More logging for ANR track-down"

8 years agoMerge "Collect user creation metrics"
Fyodor Kupolov [Wed, 6 Jan 2016 19:10:19 +0000 (19:10 +0000)]
Merge "Collect user creation metrics"

8 years agoMerge "Change fragment removal order for fragment replacement."
Aurimas Liutikas [Wed, 6 Jan 2016 19:05:36 +0000 (19:05 +0000)]
Merge "Change fragment removal order for fragment replacement."

8 years agoMore logging for ANR track-down
Robert Carr [Wed, 6 Jan 2016 19:01:43 +0000 (11:01 -0800)]
More logging for ANR track-down

More logging for ANR track-down. Seems to relate
to starting windows hanging around during app
transitions.

Bug: 26157153
Change-Id: Ie88d0c97f11bbc6fae029cf28b07b329188e5f86

8 years ago[WindowManagerService] fix starting window issue
Ronnie Leng [Mon, 4 Jan 2016 17:36:08 +0000 (11:36 -0600)]
[WindowManagerService] fix starting window issue

Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen

If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.

It needs add judgement on startingView.

Based on https://android-review.googlesource.com/#/c/194370/

Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de

8 years agoMerge "Add missing @deprecated comments to canvas methods"
Chris Craik [Wed, 6 Jan 2016 18:32:50 +0000 (18:32 +0000)]
Merge "Add missing @deprecated comments to canvas methods"

8 years agoMerge "Fixed corner-case scenario where a screenshot is finished after the share...
Felipe Leme [Wed, 6 Jan 2016 18:28:38 +0000 (18:28 +0000)]
Merge "Fixed corner-case scenario where a screenshot is finished after the share notification is sent."

8 years agoMerge "Check api level before throwing in drawable setters"
Chris Craik [Wed, 6 Jan 2016 18:18:07 +0000 (18:18 +0000)]
Merge "Check api level before throwing in drawable setters"

8 years agoFixed corner-case scenario where a screenshot is finished after the share
Felipe Leme [Wed, 6 Jan 2016 17:57:23 +0000 (09:57 -0800)]
Fixed corner-case scenario where a screenshot is finished after the share
notification is sent.

Prior to this change, if a screenshot finished after the share
notification was sent, it would replace the share notification with a
progress notification, and the share notification would never be sent
again.

Also improved the test cases that automatically generate a screenshot
but don't use it to wait for the screenshot to finish before proceeding,
otherwise it could cause a future test to fail (if the screenshot is
finished after the initial test is completed).

Change-Id: I6e2a6549ebb48e5bebf5aa78d1bda94404c1812b

8 years agoMerge "Add Ethernet feature."
Jeff Sharkey [Wed, 6 Jan 2016 18:04:57 +0000 (18:04 +0000)]
Merge "Add Ethernet feature."

8 years agoAdd Ethernet feature.
Jeff Sharkey [Wed, 6 Jan 2016 18:02:52 +0000 (11:02 -0700)]
Add Ethernet feature.

Change-Id: I1f1badff5a8c9237d9489497e36e2578266e34b4

8 years agoMerge "Discourage use of "_data" column."
Jeff Sharkey [Wed, 6 Jan 2016 17:26:25 +0000 (17:26 +0000)]
Merge "Discourage use of "_data" column."

8 years agoDiscourage use of "_data" column.
Jeff Sharkey [Wed, 6 Jan 2016 00:30:57 +0000 (17:30 -0700)]
Discourage use of "_data" column.

Moving forward, all client file access really needs to be going
through explicit APIs like openFileDescriptor(), since that allows
the provider to better protect its underlying files.

This change also changes several classes to use the AutoClosable
pattern, which enables try-with-resources usage.  Older release()
methods are deprecated in favor of close().

Uniformly apply CloseGuard across several classes, using
AtomicBoolean to avoid double-freeing, and fix several resource
leaks and bugs related to MediaScanner allocation.  Switch
MediaScanner and friends to use public API instead of raw AIDL calls.

Bug: 22958127
Change-Id: Id722379f72c9e4b80d8b72550d7ce90e5e2bc786

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 6 Jan 2016 17:11:20 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 6 Jan 2016 17:05:25 +0000 (18:05 +0100)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Work Challenge: Handle Recents launches"
Clara Bayarri [Wed, 6 Jan 2016 16:57:55 +0000 (16:57 +0000)]
Merge "Work Challenge: Handle Recents launches"

8 years agoMerge "Add support message for device admins"
Kenny Guy [Wed, 6 Jan 2016 16:27:18 +0000 (16:27 +0000)]
Merge "Add support message for device admins"

8 years agoWork Challenge: Handle Recents launches
Clara Bayarri [Fri, 4 Dec 2015 15:36:26 +0000 (15:36 +0000)]
Work Challenge: Handle Recents launches

Intercept calls to start activities from the recents
stack and show the Work Challenge if needed. This requires
passing the taskId to ConfirmDeviceCredential so it can
launch the recents task itself when the credentials are
confirmed.

Change-Id: I013b134f3f31a35b551ad683c68cc89b8af44499

8 years agoSkip the cache when loading drawables from a foreign density
Alan Viverette [Wed, 6 Jan 2016 16:11:53 +0000 (11:11 -0500)]
Skip the cache when loading drawables from a foreign density

Bug: 26400880
Change-Id: I87c06b30afc61495fe62aa6a9dfe77990200cde7

8 years agoMerge "[WindowManagerService] fix starting window issue"
Wale Ogunwale [Wed, 6 Jan 2016 15:55:02 +0000 (15:55 +0000)]
Merge "[WindowManagerService] fix starting window issue"
am: 8683f1b160

* commit '8683f1b160c10184aa15cec1b8ef776e2ce8fa9a':
  [WindowManagerService] fix starting window issue

8 years agoRevert "Revert "Hide static setDefault methods in ICU4J""
Neil Fuller [Wed, 6 Jan 2016 15:46:59 +0000 (15:46 +0000)]
Revert "Revert "Hide static setDefault methods in ICU4J""

This reverts commit 2be787e359c76086b57dc9f35868da9db71099e8.

It adds the missing file from the original commit.

Change-Id: Ia2c4a0f3fcc7ce1de222fa39b7fdf2ef7880468a

8 years agoMerge "[WindowManagerService] fix starting window issue"
Wale Ogunwale [Wed, 6 Jan 2016 15:47:05 +0000 (15:47 +0000)]
Merge "[WindowManagerService] fix starting window issue"

8 years agoMerge "Some Cleanup"
Jason Monk [Wed, 6 Jan 2016 15:25:50 +0000 (15:25 +0000)]
Merge "Some Cleanup"

8 years agoMerge "Revert "Hide static setDefault methods in ICU4J""
Neil Fuller [Wed, 6 Jan 2016 15:19:17 +0000 (15:19 +0000)]
Merge "Revert "Hide static setDefault methods in ICU4J""

8 years agoSome Cleanup
Jason Monk [Wed, 6 Jan 2016 15:19:04 +0000 (10:19 -0500)]
Some Cleanup

Bug: 26395083
Bug: 26348883
Change-Id: I1e9b92fda1c83420ad72764ce2f02d7f40b34dae

8 years agoRevert "Hide static setDefault methods in ICU4J"
Neil Fuller [Wed, 6 Jan 2016 15:17:55 +0000 (15:17 +0000)]
Revert "Hide static setDefault methods in ICU4J"

This reverts commit 6a103d33a059e009275bfc287d1aa549343259bb.

Change-Id: I4ab268ba6eb22fbbad13ab78f29465ce105026de

8 years agoMerge "Hide static setDefault methods in ICU4J"
Neil Fuller [Wed, 6 Jan 2016 15:01:24 +0000 (15:01 +0000)]
Merge "Hide static setDefault methods in ICU4J"

8 years agoHide static setDefault methods in ICU4J
Neil Fuller [Mon, 7 Dec 2015 16:50:16 +0000 (16:50 +0000)]
Hide static setDefault methods in ICU4J

Associated with a change in external/icu.

Bug: 25924145
Change-Id: I3fea5e3d88417cfb702550147c0c33d1cd2d0dc9

8 years agoMerge "More QS Tile modes in the API"
Jason Monk [Wed, 6 Jan 2016 14:18:57 +0000 (14:18 +0000)]
Merge "More QS Tile modes in the API"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 6 Jan 2016 14:05:03 +0000 (14:05 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 6 Jan 2016 14:04:33 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 6 Jan 2016 13:57:10 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE

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

8 years agoStart moving divider only after passing touch slop
Jorim Jaggi [Tue, 5 Jan 2016 14:37:42 +0000 (15:37 +0100)]
Start moving divider only after passing touch slop

So there is a clear distinction between grabbing it and
start moving it.

Change-Id: I51b50220bd35d8040d0c11f131918d9741cd8403

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 6 Jan 2016 13:53:27 +0000 (05:53 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMake sure to use right thread to change icon
Jorim Jaggi [Tue, 5 Jan 2016 13:59:28 +0000 (14:59 +0100)]
Make sure to use right thread to change icon

Not sure why this ever worked.

Change-Id: Ib044236856522fb9d9e737c885d5e9223e5f3fe3

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 6 Jan 2016 13:20:03 +0000 (05:20 -0800)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Add a new property PROPERTY_WORK_CALL"
Tony Mak [Wed, 6 Jan 2016 12:25:14 +0000 (12:25 +0000)]
Merge "Add a new property PROPERTY_WORK_CALL"

8 years agoLeave from the current root when the root is removed.
Daichi Hirono [Fri, 25 Dec 2015 02:08:42 +0000 (11:08 +0900)]
Leave from the current root when the root is removed.

This is needed to handle removable roots.

1. Add a listener to RootCache.
2. BaseActivity handles roots change and leaves from the current
   directory if the current root is removed.

BUG=26316940
Change-Id: I41921fe17782fa1a2d9e58f55ea84326b8f1d3c0

8 years agoMerge "Fixing crash in D&D due to race conditions during drag end."
Vadim Tryshev [Wed, 6 Jan 2016 02:55:06 +0000 (02:55 +0000)]
Merge "Fixing crash in D&D due to race conditions during drag end."

8 years agoMerge "Set the default mode to grid view."
Tomasz Mikolajewski [Wed, 6 Jan 2016 02:45:56 +0000 (02:45 +0000)]
Merge "Set the default mode to grid view."

8 years agoExit getAllValidScorers early if not the primary.
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.

This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.

BUG: 23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7

8 years agoMerge "For locale negotiation, assume English is always supported"
Roozbeh Pournader [Wed, 6 Jan 2016 01:27:42 +0000 (01:27 +0000)]
Merge "For locale negotiation, assume English is always supported"

8 years agoMerge "Add pseduolocales back to Settings"
Roozbeh Pournader [Wed, 6 Jan 2016 01:18:21 +0000 (01:18 +0000)]
Merge "Add pseduolocales back to Settings"

8 years agoAdd pseduolocales back to Settings
Roozbeh Pournader [Wed, 6 Jan 2016 01:12:15 +0000 (17:12 -0800)]
Add pseduolocales back to Settings

The change I2f264cdb7b7fc586124dd58fad2c68060d5b7aa8 unintentionally
removed pseduolocales from the list of locales in Settings. This
adds them back.

Bug: 26412909
Change-Id: I1d89154e1c0e0312f996252bbfc9f6ded2412d90

8 years ago[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
Tyler Gunn [Fri, 23 Oct 2015 21:39:49 +0000 (14:39 -0700)]
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.

- Added acceptRingingCall API which accepts a videostate to complement the
existing API.

Bug: 20159300
Change-Id: I2a9d53fd4dbbb0be49d95416f7e26d3ec61774cd

8 years agoChange fragment removal order for fragment replacement.
Aurimas Liutikas [Tue, 5 Jan 2016 23:58:29 +0000 (15:58 -0800)]
Change fragment removal order for fragment replacement.

Before this patch it for loop was accessing mManager.mAdded elements using
an integer index and also removing the fragments from mAdded using
mManager.removeFragment().

Bug: 24693644
Change-Id: I8e32fffa9f65c2795141f61670956740399960e4