Bill Yi
b9fb990405
Merge \"Import translations. DO NOT MERGE\" into cw-f-dev am: 1dfa221fd7 -s ours
...
am: 4653deb92b
2016-08-02 02:16:51 +00:00
Bill Yi
5a6f2cb8f3
Import translations. DO NOT MERGE am: 33e43a7f0b -s ours
...
am: a816b9a534
2016-08-02 02:16:48 +00:00
FEI WU
4f88922435
Merge \\"Make watch Switch thumb color consistent\\" into nyc-mr1-dev am: 1d2cd33cfe am: 2d1c1f40a3
...
am: 7657af8d2c
2016-08-02 02:16:45 +00:00
FEI WU
7b90b1bccc
Make watch Switch thumb color consistent am: 97f80cbd73 am: 8c3ce302c4
...
am: 90091df875
2016-08-02 02:16:42 +00:00
Dan Yu
1a35f163d6
Merge \\\"docs: Fixing incorrect div tags in l10n N docs\\\" into nyc-dev am: d70113bbd0 am: 4a187df3a1 am: b61809b5d1
...
am: a0df49012c
2016-08-02 02:16:38 +00:00
Daniel Yu
e33f2de65c
docs: Fixing incorrect div tags in l10n N docs am: 3629bc8854 am: f449d9ed36 am: bc960a990f
...
am: e5383dcd30
2016-08-02 02:11:48 +00:00
Daniel Yu
fbc4a9a072
Merge \\"docs: Fixing incorrect div tags in l10n N docs\\" into nyc-dev am: d70113bbd0 am: d22cf801f8
...
am: 3588b858c2
2016-08-02 02:11:44 +00:00
Daniel Yu
3873dc5c01
docs: Fixing incorrect div tags in l10n N docs am: 3629bc8854 am: 5af0def898
...
am: abf5d63f54
2016-08-02 02:11:41 +00:00
Svet Ganov
200f4b77b1
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: fea7cfce8b am: 5a31bfa9af
...
am: 9050576390
2016-08-02 02:11:36 +00:00
Svet Ganov
b984df3e2e
Prevent apps to overlay other apps via toast windows am: dc24f937b0 am: fd8ffb62a9
...
am: a0030632f8
2016-08-02 02:11:31 +00:00
TreeHugger Robot
39c5c6060e
Merge "Import translations. DO NOT MERGE"
2016-08-02 01:22:30 +00:00
TreeHugger Robot
1118d4ce46
Merge "Always use chooser for Share Bug Report intent."
2016-08-02 01:06:54 +00:00
Jin Seok Park
ee0b0684ae
Merge "ExifInterface: Add support for multiple RAW test files"
2016-08-02 00:23:36 +00:00
Doris Ling
52a9e777e0
Merge "Add metrics event for Settings->Display->Ambient Display."
2016-08-02 00:16:42 +00:00
Bill Yi
14baabfcd3
Import translations. DO NOT MERGE
...
Change-Id: If0208509eae2f0ccb7ae1ede9e6413434396a29e
Auto-generated-cl: translation import
2016-08-01 17:00:14 -07:00
TreeHugger Robot
1c23ed9601
Merge "Fix @link tags in keystore doc"
2016-08-01 23:49:53 +00:00
Chong Zhang
37f0905daf
Merge "Some fixes for transition animation selection"
2016-08-01 23:15:46 +00:00
Adam Lesinski
8acd38831e
Merge "Use AAPT2 to build framework resources"
2016-08-01 23:13:02 +00:00
Chong Zhang
ec8299ca45
Some fixes for transition animation selection
...
- Request wallpaper adjust after we clear mDestroying or
mAnimatingExit flags, as these could affect wallpaper
target selection result.
- Adjust wallpaper before we check lower/upper target. As
there could be pending operations that requested a wall-
paper update. Lower/upper target is needed to correctly
decide if the opening or closing apps had wallpaper.
- Make sure lower/upper targets are set even when current
target is clientHidden, in which case we should set
wallpaper target to old target but the lower/upper
still needs to be set up.
bug: 30255354
Change-Id: Ie2c94439142cbb91660c5aa4164cc660831486d5
2016-08-01 15:39:32 -07:00
TreeHugger Robot
5fa4754c0c
Merge "Removed use of WindowState.mTargetAppToken"
2016-08-01 22:19:04 +00:00
Android Build Merger (Role)
87f6903a29
Merge "Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09 am: dbf07bb8ef am: 0d287f1846"
2016-08-01 22:07:39 +00:00
Android Build Merger (Role)
8112f78008
Merge "Merge \\"Revert \\"LauncherApps should also throw when user is locked\\"\\" into nyc-mr1-dev am: 5faa852c57 am: 9e05cb8d54 am: cb10be47b1"
2016-08-01 22:07:28 +00:00
Android Build Merger (Role)
36734d9a3b
Merge "Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac am: e330d59c2e am: 685091f203"
2016-08-01 22:07:18 +00:00
Android Build Merger (Role)
95cb3c49c0
Merge "docs: Update Android Dashboard for August 2016 am: 3d1cd9d2da am: 5483ad29ad am: 160c3437b2 am: 3f0c71b107 am: 0b71bcb17f"
2016-08-01 22:07:07 +00:00
Android Build Merger (Role)
dcdd0522ab
Merge "docs: Update Android Dashboard for August 2016 am: 3d1cd9d2da am: 5483ad29ad am: 42fc0a5548 am: 3ce66a7064"
2016-08-01 22:06:57 +00:00
Fyodor Kupolov
9e01f2ace5
Merge \\\"Fix the API compatibility of \\\"UriMatcher#addURI\\\"\\\" am: 3e151273a3 am: bc8d946e09 am: dbf07bb8ef
...
am: 0d287f1846
2016-08-01 22:06:15 +00:00
Makoto Onuki
14132bb06e
Merge \\"Revert \\"LauncherApps should also throw when user is locked\\"\\" into nyc-mr1-dev am: 5faa852c57 am: 9e05cb8d54
...
am: cb10be47b1
2016-08-01 22:06:11 +00:00
Makoto Onuki
a31a6f9f27
Revert \\"LauncherApps should also throw when user is locked\\" am: 2ec16b08ac am: e330d59c2e
...
am: 685091f203
2016-08-01 22:06:08 +00:00
Joe Fernandez
0444d36755
docs: Update Android Dashboard for August 2016 am: 3d1cd9d2da am: 5483ad29ad am: 160c3437b2 am: 3f0c71b107
...
am: 0b71bcb17f
2016-08-01 22:06:05 +00:00
Joe Fernandez
22dddec3b4
docs: Update Android Dashboard for August 2016 am: 3d1cd9d2da am: 5483ad29ad am: 42fc0a5548
...
am: 3ce66a7064
2016-08-01 22:06:02 +00:00
Adam Lesinski
3822763bfc
Merge "AAPT2: Add script to remove duplicate resource definitions"
2016-08-01 22:05:49 +00:00
Adam Lesinski
6bce46e3a9
Merge "AAPT2: Allow <intent-filter> within <provider> in AndroidManifest.xml"
2016-08-01 22:04:52 +00:00
Adam Lesinski
bb5a390142
AAPT2: Allow <intent-filter> within <provider> in AndroidManifest.xml
...
Change-Id: I005120b76679f51039ddc40160c96ead6ab5fa4f
2016-08-01 15:01:08 -07:00
Doris Ling
6524c50b3b
Add metrics event for Settings->Display->Ambient Display.
...
Bug: 29994493
Change-Id: Idd644854b7f63c89f4672cae68ea208d65fed0ef
2016-08-01 14:50:55 -07:00
Android Build Merger (Role)
213d4ba895
Merge changes from topic 'am-b66c4552aecc498fa98e74359e122115'
...
* changes:
Merge \\"Prevent brightness changes before boot complete.\\" into nyc-mr1-dev am: fbd93027e46d0c9ffc5c6108fe0cb99f818ea46316890dd98039055069387f96551b038616408535e4c00dd151
2016-08-01 21:47:46 +00:00
Michael Wright
0c2405ebf8
Merge \\"Prevent brightness changes before boot complete.\\" into nyc-mr1-dev am: fbd93027e4 am: 6d0c9ffc5c
...
am: 6108fe0cb9
2016-08-01 21:46:53 +00:00
Michael Wright
3678d54a3f
Prevent brightness changes before boot complete. am: 9f818ea463 am: 16890dd980
...
am: 3905506938
2016-08-01 21:45:40 +00:00
Kazuhiro Inaba
2de55f9d3c
Merge \\"Cap minimum visibilty of floating windows by the real size.\\" into nyc-mr1-dev am: 7f96551b03 am: 8616408535
...
am: e4c00dd151
2016-08-01 21:45:36 +00:00
George Mount
921891518a
Merge "Convert BackStackRecord Operations to ArrayList."
2016-08-01 21:44:52 +00:00
Romain Guy
1b4ab52e24
Merge "Expose Path.approximate()"
2016-08-01 21:26:09 +00:00
Kazuhiro Inaba
559f9b704f
Cap minimum visibilty of floating windows by the real size. am: ad0f7793c7 am: 31786aba2c
...
am: 9a9edcd80e
2016-08-01 21:15:28 +00:00
Sungsoo Lim
c674cb8ad9
Merge \\\\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\\\" into lmp-dev am: 124cc534f8 -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944 -s ours am: cc154342aa am: ee0c3b013a am: 0d05028ba8 am: 2f7756f4c9 -s ours am: ea7fa85a0d am: 3a9923d7cf am: c6bc64e106
...
am: d89ca549b3
2016-08-01 21:14:54 +00:00
Sungsoo Lim
e67ca0e89e
DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours am: 0fb1075d95 am: f928b8062c am: 1fcc472b3e -s ours am: 1559998d08 am: c3485668ad am: 174f17bc19 am: cf94d53469 -s ours am: accabefc6b am: ce272c6b6b am: 6b1d8fba12
...
am: 7d9c8b247f
2016-08-01 21:14:23 +00:00
Sudheer Shanka
e5f220403a
Merge \\\\\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd am: 9457779aa4 am: 247edeb721 -s ours am: 3cfa1bb8ec am: fe3fec0558 am: f5b8501759
...
am: 5d00354598
2016-08-01 21:13:47 +00:00
Sudheer Shanka
3c4901fd62
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 7ef684713e am: 9f6bd40108 am: f01ee1c291 -s ours am: 373492b076 am: c2178ed1d9 am: 32f4f1a697 am: 5b420a7b44 -s ours am: efe9502301 am: 92f00c6b5d am: 1bc1e2a348
...
am: 646c6bc085
2016-08-01 21:12:32 +00:00
Sudheer Shanka
a48a6f85aa
Merge \\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\" into mnc-dev am: e140322bde am: 088e081ac1 am: 72f9d1ff97 am: 9a7c067034 -s ours am: ea60ad5173 am: 54aeda8e7f am: fff615adcb
...
am: 21f97c6cce
2016-08-01 21:11:43 +00:00
Sudheer Shanka
8a01ccf0ad
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am: 8a8d7e7962 am: 2349d0dea5 am: 7559673a6d am: 77f0b54c0b -s ours am: a8ff98fbce am: 60fac50f71 am: 9b0cc5de5f
...
am: 6428499d6e
2016-08-01 21:11:39 +00:00
Kevin Hufnagle
19dd598a4e
Merge \\\\"docs: Improved Google Play Developer Console documentation\\\\" into nyc-docs am: 88f0518ce3 am: 72108d200d am: e351f7d3c2 am: d45e6c5769
...
am: 01e80419f7
2016-08-01 21:11:35 +00:00
Bill Yi
4653deb92b
Merge \"Import translations. DO NOT MERGE\" into cw-f-dev
...
am: 1dfa221fd7
2016-08-01 20:58:18 +00:00
Bill Yi
a816b9a534
Import translations. DO NOT MERGE
...
am: 33e43a7f0b
2016-08-01 20:58:15 +00:00
