OSDN Git Service
Przemyslaw Szczepaniak [Thu, 9 Jul 2015 12:28:30 +0000 (13:28 +0100)]
Switch RecoverySystem impl to use sun.security.pkcs
Due to org.apache.harmony.security package removal,
RecoverySystem#verifyPackage was rewritten to use
sun.security.pkcs package for verifining package
signature.
(cherry-picked from
84acbd76f7e1300e8404ac1b94f008826f9cc0fb)
Change-Id: I3a2058982beadab1aaae793c25db5c6f7387a72b
Narayan Kamath [Mon, 27 Jul 2015 13:02:11 +0000 (14:02 +0100)]
Use libcore/known_oj_tags for the javadoc stage.
Helps us process (and discard) OpenJdk specific javadoc tags.
(cherry-picked from
e03d5e477b47e4ac8e227d649afd4ffe89f23712)
Change-Id: I35287e9b56c148eb6cd8f37d7df81920d0d8a3bb
Filip Gruszczynski [Sat, 21 Nov 2015 01:26:58 +0000 (01:26 +0000)]
Merge "Fix thumbnail aspect invisible in single freeform to recents transition."
Filip Gruszczynski [Sat, 21 Nov 2015 01:10:04 +0000 (17:10 -0800)]
Fix thumbnail aspect invisible in single freeform to recents transition.
Change-Id: Ib73b436c5b201539ec279725467185f59d07a8b9
Sandra Kwan [Sat, 21 Nov 2015 01:05:06 +0000 (01:05 +0000)]
Merge "AccountManager: add startUpdateCredentials API."
Amit Mahajan [Sat, 21 Nov 2015 01:00:48 +0000 (01:00 +0000)]
Merge "Added PHONE_TYPE_CDMA_LTE"
Sandra Kwan [Fri, 13 Nov 2015 01:11:49 +0000 (17:11 -0800)]
AccountManager: add startUpdateCredentials API.
Adding startUpdateCredentials API to AccountManager and
AbstractAccountAuthenticator.
Change-Id: Id9a1ff86764f2fde01fd8482594e4ae34e1f3bd1
Filip Gruszczynski [Sat, 21 Nov 2015 00:42:30 +0000 (00:42 +0000)]
Merge "Synchronize thumbnail header in recents to freeform animation."
Filip Gruszczynski [Sat, 21 Nov 2015 00:42:01 +0000 (00:42 +0000)]
Merge "Handling touch events on the caption."
Vladislav Kaznacheev [Fri, 20 Nov 2015 00:00:28 +0000 (16:00 -0800)]
'Drag and drop failed' animation
If the drop has not been consumed (DragState.mDragResult is false)
the drag shadow surface is not immediately destroyed, but animated
back into the position where the drag started.
The current animation is an OK placeholder, still waiting for the
final word from UX.
Bug:
24415573
Change-Id: Ia30135ce1e85655c8ba16e28dc69f0ebf9b36239
Dianne Hackborn [Sat, 21 Nov 2015 00:07:22 +0000 (00:07 +0000)]
Merge "Fix issue #
25779155: Random crash in the system server"
Vladislav Kaznacheev [Fri, 20 Nov 2015 23:58:21 +0000 (23:58 +0000)]
Merge "Implement View.cancelDragAndDrop"
Chris Craik [Fri, 20 Nov 2015 23:50:19 +0000 (23:50 +0000)]
Merge "Initial text support in new reorderer/renderer"
Vladislav Kaznacheev [Fri, 20 Nov 2015 22:20:13 +0000 (14:20 -0800)]
Implement View.cancelDragAndDrop
View.cancelDragAndDrop cancels a drag operation initiated by
View.startDragAndDrop.
It has to be called on a View in the same window (under the
same ViewRootImpl) that the view which started the drag.
Bug:
24415683
Change-Id: If9a265fd8cc4d26b207d582d0d02d5c9ae78eba1
Fyodor Kupolov [Fri, 20 Nov 2015 23:18:29 +0000 (23:18 +0000)]
Merge "Added keep-uninstalled-packages DO policy"
Amith Yamasani [Fri, 20 Nov 2015 23:17:41 +0000 (23:17 +0000)]
Merge "Fix missing observer reply callbacks"
Fyodor Kupolov [Thu, 5 Nov 2015 22:27:06 +0000 (14:27 -0800)]
Added keep-uninstalled-packages DO policy
This policy allows DO to specify a list of apps to cache even without being
installed on any user.
Bug:
23938464
Change-Id: I2eeab7f148409739fc23a5c44e955ad12b63fd04
Dianne Hackborn [Fri, 20 Nov 2015 22:49:59 +0000 (14:49 -0800)]
Fix issue #
25779155: Random crash in the system server
Change-Id: I7c6ef4dcb9b88ca2d9b54010b2007b6bf88f9958
Vladislav Kaznacheev [Fri, 20 Nov 2015 22:18:30 +0000 (22:18 +0000)]
Merge "Add View.startDragAndDrop and deprecate View.startDrag"
Amith Yamasani [Fri, 20 Nov 2015 17:44:08 +0000 (09:44 -0800)]
Fix missing observer reply callbacks
This was causing upto 2 seconds in user switching delay.
Also switched to using Log.wtf for the timeout message to
track any regressions in this due to new clients.
Bug:
25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc
Filip Gruszczynski [Fri, 20 Nov 2015 22:02:57 +0000 (22:02 +0000)]
Merge "Remove allow_stacked_button_bar from support library."
Filip Gruszczynski [Fri, 20 Nov 2015 19:25:23 +0000 (11:25 -0800)]
Synchronize thumbnail header in recents to freeform animation.
Bug:
24913782
Change-Id: I46792ea3135794e514894783e1ee5fa696576f7f
Alan Viverette [Fri, 20 Nov 2015 21:59:19 +0000 (21:59 +0000)]
Merge "Dispatch the actual PopupWindow dismiss callback to PopupMenu"
Phil Weaver [Fri, 20 Nov 2015 21:55:53 +0000 (21:55 +0000)]
Merge "Dispatch key events to multiple a11y services."
Phil Weaver [Tue, 17 Nov 2015 00:24:18 +0000 (16:24 -0800)]
Dispatch key events to multiple a11y services.
Introducing a new class to manage key event dispatch
that sends all events to all classes that request them.
Bug:
22332500,
22515057
Change-Id: I8521f6257a4ac6c8f2eff14186789630d680ff11
Filip Gruszczynski [Fri, 20 Nov 2015 02:22:16 +0000 (18:22 -0800)]
Handling touch events on the caption.
We need a more sophisticated touch handling to support overlaying the
caption. The touch events need to be routed in following order:
close/maximize buttons, application content, caption dragging.
Bug:
25486369
Change-Id: I9d4e971fb055c217c0bd83f0490fb42a5c22e93b
Svetoslav Ganov [Fri, 20 Nov 2015 21:10:52 +0000 (21:10 +0000)]
Merge "Use resolved calling user id"
Svetoslav [Fri, 20 Nov 2015 21:09:26 +0000 (13:09 -0800)]
Use resolved calling user id
bug:
25476216
Change-Id: I0093a5c071affaa5f3ca8eeb0e3a7a36b66a3c1f
Vladislav Kaznacheev [Fri, 20 Nov 2015 20:59:42 +0000 (12:59 -0800)]
Add View.startDragAndDrop and deprecate View.startDrag
This in preparation to adding a new method to cancel an
ongoing drag. This method cannot be called cancelDrag,
stopDrag or endDrag because these names are already
taken by View-derived classes in the framework or in
important apps.
Change-Id: Ie21a778c3253b2d526c0c1bcc423c374ca70ee01
Adam Lesinski [Fri, 20 Nov 2015 20:33:52 +0000 (20:33 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours am:
888916ff0f -s ours am:
29db6ccb72 -s ours
am:
6cd5beed50 -s ours
* commit '
6cd5beed5000c732a25811dc40aee1ecd29745f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Julia Reynolds [Fri, 20 Nov 2015 20:31:08 +0000 (20:31 +0000)]
Merge "Implement notification ranking by topic."
Jim Kaye [Fri, 20 Nov 2015 20:28:34 +0000 (20:28 +0000)]
Merge "Extend the 'qwerty' key layout"
Adam Lesinski [Fri, 20 Nov 2015 20:27:01 +0000 (20:27 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours am:
888916ff0f -s ours
am:
29db6ccb72 -s ours
* commit '
29db6ccb72b1b43568f2045825cf5435bd661e00':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Alan Viverette [Fri, 20 Nov 2015 20:21:30 +0000 (15:21 -0500)]
Dispatch the actual PopupWindow dismiss callback to PopupMenu
Previously the dismiss callback was called immediately after the menu
received a close request; however, the dismiss callback implies that
the menu's window has finished animating and been removed from the
window manager.
Also cleans up handling of mPopup in MenuPopupHelper to prevent
unnecessary MenuPopup allocations and convert unnecessary fields into
method arguments.
Bug:
25323707
Change-Id: I8e3877ae6c40b4d0f1df23a4ff4fa48a7df34e0d
Geoff Mendal [Fri, 20 Nov 2015 20:20:39 +0000 (20:20 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours
am:
f9abfccf9d -s ours
* commit '
f9abfccf9d7d5e3fdf3501b3d568cf85c1e14869':
Adam Lesinski [Fri, 20 Nov 2015 20:20:14 +0000 (20:20 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours
am:
888916ff0f -s ours
* commit '
888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Geoff Mendal [Fri, 20 Nov 2015 20:15:12 +0000 (20:15 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours
am:
1bd58bfd5b -s ours
* commit '
1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
Adam Lesinski [Fri, 20 Nov 2015 20:14:08 +0000 (20:14 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
am:
6902052c77 -s ours
* commit '
6902052c77bbcb9078b4ced243874f67542f64f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Wale Ogunwale [Fri, 20 Nov 2015 19:37:57 +0000 (19:37 +0000)]
Merge "Fixed unexpected configuration change causing activity relaunch"
Alan Viverette [Fri, 20 Nov 2015 19:27:44 +0000 (19:27 +0000)]
Merge "By default, display PopupMenu at Gravity.START and resolve X offset"
Julia Reynolds [Mon, 19 Oct 2015 17:51:23 +0000 (13:51 -0400)]
Implement notification ranking by topic.
Including sensitive notification visibility & DND bypass.
Bug:
22451710
Change-Id: I5f3a0c6d59de0495cb904bad6f886eb29ed4bda4
Chris Craik [Thu, 19 Nov 2015 21:02:43 +0000 (13:02 -0800)]
Initial text support in new reorderer/renderer
Removes obsolete drawPosText codepath, and unifies text decoration behavior.
Change-Id: I9c563249ab688a3394445a0e7fe1b9d0661f6f7c
Ritesh Reddy [Fri, 20 Nov 2015 19:02:07 +0000 (19:02 +0000)]
Merge "Enabled backup/restore of Charging Sounds"
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
Filip Gruszczynski [Fri, 20 Nov 2015 18:55:19 +0000 (10:55 -0800)]
Remove allow_stacked_button_bar from support library.
Bug:
25394588
Change-Id: Id7896746aebeab273297f3c5e78f0f794fa5bc82
Alan Viverette [Fri, 20 Nov 2015 18:57:15 +0000 (13:57 -0500)]
By default, display PopupMenu at Gravity.START and resolve X offset
Bug:
25801269
Change-Id: I8c8090a59780c131cee2d56b668f1c4e062b8ebe
Adam Lesinski [Fri, 20 Nov 2015 18:53:03 +0000 (18:53 +0000)]
Merge "Fix batterystats battery level int packing"
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
Ritesh Reddy [Fri, 20 Nov 2015 16:43:28 +0000 (16:43 +0000)]
Enabled backup/restore of Charging Sounds
Included the charging_sounds key in the Settings to backup/restore
Bug:
25694355
Change-Id: I4a8653f32b58ab326019698784b8cf60c6c0220e
Chris Tate [Fri, 20 Nov 2015 18:15:52 +0000 (18:15 +0000)]
Merge "Don\'t back up / restore EAP network definitions" am:
14a0981fde am:
b5a38f6da5
am:
96333c2e8c
* commit '
96333c2e8cd13df55e8c878925f8cd2e9c90ac42':
Don't back up / restore EAP network definitions
Wale Ogunwale [Fri, 20 Nov 2015 17:36:46 +0000 (09:36 -0800)]
Fixed unexpected configuration change causing activity relaunch
In commit
ebcc875f we migrated the setting of the task override
configuration from WM to AM. However, the migration changed the
construction of the override configuration to take in the service
configuration as the starting value. This is incorrect since the
only values that should be set in the override configuration are
the ones that change due to resizing. We now seed the override
configuration with the EMPTY value to make it obvious that the
object should be constructed with the default values.
Also, fixed issue with WM telling activity manager to resize a stack
when the stack is already the size it wants.
Bug:
25776219
Change-Id: I882979aa87b49e7a5dc993bd9223fbd6e6cf6471
Chris Tate [Fri, 20 Nov 2015 18:10:21 +0000 (18:10 +0000)]
Merge "Don\'t back up / restore EAP network definitions" am:
14a0981fde
am:
b5a38f6da5
* commit '
b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:05:04 +0000 (18:05 +0000)]
Merge "Don\'t back up / restore EAP network definitions"
am:
14a0981fde
* commit '
14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Don't back up / restore EAP network definitions"
Jim Kaye [Wed, 18 Nov 2015 22:49:24 +0000 (14:49 -0800)]
Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.
These are needed to support Emulator UI
buttons for these functions.
Change-Id: I5d5d25a77625bfd831cf7b31c126fd342efc6c5b
Ricky Wai [Fri, 20 Nov 2015 17:37:47 +0000 (17:37 +0000)]
Merge "Add ContactsContract.Contacts.CORP_CONTENT_FILTER_URI"
Steve McKay [Fri, 20 Nov 2015 16:44:55 +0000 (08:44 -0800)]
Intent-filter for BROWSE action.
Missing from ag/777423
Bug:
25806013
Change-Id: I79ac0946f0d4548efab23e363dfa864ad8b1426a
Przemyslaw Szczepaniak [Wed, 18 Nov 2015 15:03:13 +0000 (15:03 +0000)]
Stop preloading fortress classes
(cherry-picked from
90d8781876643dc730aecee20f34dbe9e695653c)
Change-Id: If184fe9e40ba4c21fdb05d38c2975abfb4d0410b
Przemyslaw Szczepaniak [Thu, 15 Oct 2015 10:04:19 +0000 (11:04 +0100)]
Use HexDump instead of java.lang.IntegralToString
java.lang.IntegralToString is being removed, replaced
all its usage by com.android.internal.util.HexDump.
Bug:
24932279
(cherry-picked from
15fc0548a536750110e159e06a39ba943eccdd81)
Change-Id: Id6ab88337af12d93cd73c41775b9d5baa1e61d96
Alan Viverette [Fri, 20 Nov 2015 14:10:48 +0000 (14:10 +0000)]
Merge "Set mTempCalendar in TimePickerSpinnerDelegate"
Piotr Jastrzebski [Tue, 17 Feb 2015 16:58:52 +0000 (16:58 +0000)]
Add core-oj to the list of core library jars.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry-picked from
f898cda2f499b14f92bc7fb75f44110cdec7654f)
Change-Id: Ica148f11bcc77f57d22944ff78c501611a293167
Ricky Wai [Mon, 16 Nov 2015 12:25:45 +0000 (12:25 +0000)]
Add ContactsContract.Contacts.CORP_CONTENT_FILTER_URI
Bug:
25797489
Change-Id: I0b862c1b179cffd3591e5082d6f9102a070a4053
Ricky Wai [Fri, 20 Nov 2015 12:33:11 +0000 (12:33 +0000)]
Merge "Add Work Contacts Directory APIs"
Sudheer Shanka [Fri, 20 Nov 2015 12:23:54 +0000 (12:23 +0000)]
Merge "Add per-user version of DevicePolicyManager.getUserRestrictions."
Nicolas Prévot [Fri, 20 Nov 2015 11:37:02 +0000 (11:37 +0000)]
Merge "Add an extra for the logo uri to DevicePolicyManager."
Tomasz Mikolajewski [Mon, 16 Nov 2015 02:41:28 +0000 (11:41 +0900)]
Add first-class support for virtual files in SAF.
Bug:
20820363
Change-Id: Ic509a6003a99997126f129a836fdd8c0e843108f
Seigo Nonaka [Fri, 20 Nov 2015 05:45:26 +0000 (05:45 +0000)]
Merge "Make Paint.hasGlyph variation selector aware."
Geoff Mendal [Fri, 20 Nov 2015 03:56:34 +0000 (03:56 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours am:
fd773d1ba7 -s ours am:
b1a5fef946 -s ours
am:
4943634c10 -s ours
* commit '
4943634c10e7973400404e9e6b0b7de0b494f770':
Import translations. DO NOT MERGE
Deepanshu Gupta [Fri, 20 Nov 2015 03:55:07 +0000 (03:55 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am:
35f7562495 am:
2d887558df am:
0627cd0c40
am:
adca23bb4c
* commit '
adca23bb4c59b1514b5d86f1ab8100c400d7a71e':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Fri, 20 Nov 2015 03:53:45 +0000 (03:53 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am:
8c971ae5a0 am:
867c370465 am:
4d9df358ec
am:
138a901db4
* commit '
138a901db492989ae7db53d664cac698cc5bfdc7':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Sreeram Ramachandran [Fri, 20 Nov 2015 03:52:20 +0000 (03:52 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0 am:
5d41bd8d1a am:
c1552f0caf am:
38a3b2154c
am:
9ebdd27142
* commit '
9ebdd271422cb4a091f3b467899506cebb0fa944':
Don't use framework permission strings for netd permissions.
Vineeta Srivastava [Fri, 20 Nov 2015 03:50:46 +0000 (03:50 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am:
013c7daedd am:
cb948af246
am:
8e8c12acfa
* commit '
8e8c12acfa946346a28c031653aa93caaee7c7cb':
Fix MVNO hotspot bug for Europe
Rob Carr [Fri, 20 Nov 2015 02:45:20 +0000 (02:45 +0000)]
Merge "Prevent SurfaceView flash while resizing."
Robert Carr [Wed, 18 Nov 2015 21:37:46 +0000 (13:37 -0800)]
Prevent SurfaceView flash while resizing.
We need to make sure we do not preserve
and destroy attached windows when entering
drag resize as we will not swap these windows
to the big surface. On a similar note,
we need to make sure we do not hide child windows
when destroying the parent window for preservation.
Change-Id: I98e02f08d0ea2d5f0032ec7691e865c536df19c6
Geoff Mendal [Fri, 20 Nov 2015 01:56:21 +0000 (01:56 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours am:
fd773d1ba7 -s ours
am:
b1a5fef946 -s ours
* commit '
b1a5fef946bf5ec1c9bb59696cad9534ba72190b':
Import translations. DO NOT MERGE
Deepanshu Gupta [Fri, 20 Nov 2015 01:55:01 +0000 (01:55 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am:
35f7562495 am:
2d887558df
am:
0627cd0c40
* commit '
0627cd0c404838a0251ee359ed75041f430fa83b':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Fri, 20 Nov 2015 01:53:43 +0000 (01:53 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am:
8c971ae5a0 am:
867c370465
am:
4d9df358ec
* commit '
4d9df358ec847262872c09962105537be350f8fd':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Sreeram Ramachandran [Fri, 20 Nov 2015 01:52:25 +0000 (01:52 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0 am:
5d41bd8d1a am:
c1552f0caf
am:
38a3b2154c
* commit '
38a3b2154c7ee5d75b5670abaa4c154edd3c36eb':
Don't use framework permission strings for netd permissions.
Vineeta Srivastava [Fri, 20 Nov 2015 01:51:01 +0000 (01:51 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev am:
013c7daedd
am:
cb948af246
* commit '
cb948af2469ca3869d368c0162dd459912afb0b9':
Fix MVNO hotspot bug for Europe
Guang Zhu [Fri, 20 Nov 2015 01:46:25 +0000 (01:46 +0000)]
Merge "resolve merge conflicts of
723462eba9 to "
Guang Zhu [Fri, 20 Nov 2015 01:43:28 +0000 (17:43 -0800)]
resolve merge conflicts of
723462eba9 to master.
Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f
Geoff Mendal [Fri, 20 Nov 2015 01:40:42 +0000 (01:40 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours
am:
fd773d1ba7 -s ours
* commit '
fd773d1ba76c29b8888c71906ef44ec09a551627':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:30:35 +0000 (01:30 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours
am:
1bd58bfd5b -s ours
* commit '
1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours
am:
d0709c3a32 -s ours
* commit '
d0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am:
bddde9b83d -s ours
* commit '
bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
Alex Deymo [Fri, 20 Nov 2015 00:18:01 +0000 (00:18 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev am:
8d31b08904
am:
f7d10eca49
* commit '
f7d10eca499fee37d8dfc89ec6779a7b46c70be5':
Remove the aidl tool
Guang Zhu [Fri, 20 Nov 2015 00:01:31 +0000 (00:01 +0000)]
add lost RAM info to compact meminfo dump am:
877c6c7742
am:
b681ec0219
* commit '
b681ec02194039768767215b2479507742288c98':
add lost RAM info to compact meminfo dump
Steve McKay [Fri, 20 Nov 2015 00:01:25 +0000 (00:01 +0000)]
Merge "Add "Home" directory support."
Steve McKay [Wed, 18 Nov 2015 22:56:50 +0000 (14:56 -0800)]
Add "Home" directory support.
Update FilesActivityUiTests to verify Home is present
and that clicking a root sets the title accordingly.
Guard addition of WRITABLE flag with a volume test.
Bug:
25147243
Change-Id: Ic20372737cae08a82af0aade0c0dbbd8c22d5f34
Fyodor Kupolov [Thu, 19 Nov 2015 23:52:45 +0000 (23:52 +0000)]
Merge "Added a placeholder home activity for system user"
Alex Deymo [Thu, 19 Nov 2015 23:50:25 +0000 (23:50 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
am:
8d31b08904
* commit '
8d31b089040dafefee16033176a884d43e259804':
Remove the aidl tool
Roozbeh Pournader [Thu, 19 Nov 2015 23:44:22 +0000 (23:44 +0000)]
Merge "Support LocaleLists in ActivityManagerService."
Adam Lesinski [Thu, 19 Nov 2015 23:43:08 +0000 (23:43 +0000)]
Merge "AAPT2: Fail compiling when private symbols are referenced"
Jorim Jaggi [Thu, 19 Nov 2015 23:23:01 +0000 (23:23 +0000)]
Merge "Add gesture to drag in recents from navigation bar"
Makoto Onuki [Thu, 19 Nov 2015 22:53:37 +0000 (22:53 +0000)]
Merge "More work on layered user restrictions."
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:50:49 +0000 (22:50 +0000)]
Merge "Revert "Fix broken build""
Vladislav Kaznacheev [Thu, 19 Nov 2015 22:50:33 +0000 (22:50 +0000)]
Revert "Fix broken build"
This reverts commit
88d753291c834c41ad6c9229082146be72cf8014.
Revert required because the base class change
has been reverted in http://ag/816441
Change-Id: Iee8a8272bda0a92aed8ae46af8439910d8f1ecdc
Yohei Yukawa [Thu, 19 Nov 2015 22:49:40 +0000 (22:49 +0000)]
Merge "Track by which client the last focused window was reported."
Adam Lesinski [Tue, 17 Nov 2015 01:35:44 +0000 (17:35 -0800)]
AAPT2: Fail compiling when private symbols are referenced
Also moved some XML specific stuff into its own directory,
and refactored ReferenceLinker a bit.
Change-Id: I912247a82023c1bbf72dc191fbdaf62858cbec0c
OSDN Git Service
