drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,236 Commits 1 Branch 0 Tags
Commit Graph

277236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dimitry Ivanov
f3ea5e1bae Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff am: c58ea7d777 
am: 96be90067d

Change-Id: Ib8c9a123e1e821ec3e5b174f9c78bfd5399c166e
 2016-08-02 02:34:38 +00:00
Kevin Hufnagle
3ad1d8fc2c Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev am: 30583c32e2 am: 1d785c5bd5 am: 582fd43b78 
am: 0e412641d9

Change-Id: Ic895d90f11512593c20c331b95d9bd201f700bdf
 2016-08-02 02:34:27 +00:00
Joe Fernandez
b5bf7d0acc cherry-pick from mnc-mr-docs: docs: SafeBrowsing API am: 843f022c47 am: 3a716d9b19 am: daa24df4b4 
am: f7c0ce5a32

Change-Id: I10de9d77732ba3c9c56e12c12628967545d8ae34
 2016-08-02 02:34:23 +00:00
Joe Fernandez
30990bc163 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev am: 30583c32e2 am: 85b3c19fd3 
am: ddc7ca05a3

Change-Id: I3e7097f81866500ea0c8e06fde178699ff8fba95
 2016-08-02 02:34:20 +00:00
Joe Fernandez
998a875071 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API am: 843f022c47 am: e07150aff2 
am: accb3a7dee

Change-Id: Ida4f3e0fe00d5a7b4542c130ad4044c9636c03e5
 2016-08-02 02:34:16 +00:00
John Reck
13168c0cc6 Merge "Fix null deref crash" into nyc-mr1-dev am: fc9689e1ed am: fb20b5e13b 
am: 3669d0fbc0

Change-Id: I5a26d8dbc662c4fea1fa998154178f281e776ccf
 2016-08-02 02:23:52 +00:00
John Reck
56f9ccfa15 Fix null deref crash am: 882d515cd5 am: ed93e111c5 
am: 86e700ebc9

Change-Id: I97412741a5f41fa0c5bec56795cf7f7b8875f738
 2016-08-02 02:23:48 +00:00
Bill Yi
66cb444f12 Merge "Import translations. DO NOT MERGE" into cw-f-dev am: ffc5b3e4e9 -s ours 
am: 5d6931dd78  -s ours

Change-Id: Iefbee6ef1c3242c9add7285de8ba0f34c0283bf7
 2016-08-02 02:23:44 +00:00
Bill Yi
e0e2be9120 Import translations. DO NOT MERGE am: 8806c6d033 -s ours 
am: b1edaaca03  -s ours

Change-Id: I38d9e4053f89c8882916c6b7bd157b906c704b47
 2016-08-02 02:23:39 +00:00
Alan Viverette
31d4f87c0f Merge \"Adjust touch progress offset to account for changes to AbsSeekBar\" into nyc-mr1-dev am: 7dd40cd411 am: e564f1dcde 
am: 6d888b251b

Change-Id: I73aef4d77b1f1bc0fc42e3f8819347876c73d53d
 2016-08-02 02:23:34 +00:00
Alan Viverette
cf3a479d59 Adjust touch progress offset to account for changes to AbsSeekBar am: 1d33c3f3a3 am: 1cad05bdc0 
am: c0acf68d30

Change-Id: Ia751dd2246bcfa0ea2a51411d00ae0f712531808
 2016-08-02 02:20:44 +00:00
Bill Yi
bb04097312 Merge \"Import translations. DO NOT MERGE\" into cw-f-dev am: 6393875f25 -s ours 
am: 1032a8b797  -s ours

Change-Id: Ifc0931445b752a5d5fa06a5e67353b6849f603e7
 2016-08-02 02:20:34 +00:00
Bill Yi
26301d0769 Import translations. DO NOT MERGE am: 124e246546 -s ours 
am: bb0ca9995a  -s ours

Change-Id: I880c27df7cba45edf806445baf0e5cef88bf414f
 2016-08-02 02:20:27 +00:00
Bill Yi
9181225931 Merge \"Import translations. DO NOT MERGE\" into cw-f-dev am: 273fd1d18a -s ours 
am: f9e410d67e  -s ours

Change-Id: I5622b7c38a1c0968cc2f357a6a2a4c5c7926feeb
 2016-08-02 02:20:20 +00:00
Bill Yi
182db8ba37 Import translations. DO NOT MERGE am: 352c3e4169 -s ours 
am: 9fd60541c5  -s ours

Change-Id: Id2c13f686e34dfab2867ab79828c7bc7435df648
 2016-08-02 02:20:14 +00:00
Bill Yi
b9fb990405 Merge \"Import translations. DO NOT MERGE\" into cw-f-dev am: 1dfa221fd7 -s ours 
am: 4653deb92b  -s ours

Change-Id: I0071bdcdb9f920a706313abb8f4d70e50305f0a4
 2016-08-02 02:16:51 +00:00
Bill Yi
5a6f2cb8f3 Import translations. DO NOT MERGE am: 33e43a7f0b -s ours 
am: a816b9a534  -s ours

Change-Id: Ia58cb78f064a90275d5abcfcca66fdefc6cde403
 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

Change-Id: I443b1c5651fdc93629439885d944dc5c868631b4
 2016-08-02 02:16:45 +00:00
FEI WU
7b90b1bccc Make watch Switch thumb color consistent am: 97f80cbd73 am: 8c3ce302c4 
am: 90091df875

Change-Id: I0e36f428429d84b11f23029e7e16660684aefded
 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

Change-Id: I94ecda01adf5caa11d9f6427d302b4e4b96e39a3
 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

Change-Id: I704dc6ade9b12761eb05d7f3ae56dca7285c2e03
 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

Change-Id: I57bcc447079e517de00bbe3243f5a0520e234ad2
 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

Change-Id: I4149ed6767a3e2cd1e3462f3108b86ae5ba87a08
 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

Change-Id: I838c61062c9ba322e50b5f01a62c7afc0e3861a5
 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  -s ours

Change-Id: If5d35ecbe00b53e869739365e4dc24590ab07c1c
 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
Dimitry Ivanov
96be90067d Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff 
am: c58ea7d777

Change-Id: Ie2b5e51731c6daa24321a220eca0b7312ada6432
 2016-08-01 23:10:54 +00:00
Joe Fernandez
0e412641d9 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev am: 30583c32e2 am: 1d785c5bd5 
am: 582fd43b78

Change-Id: Ie88b7bc81e1af82b540013981168a63c94a263ee
 2016-08-01 23:10:35 +00:00
Joe Fernandez
f7c0ce5a32 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API am: 843f022c47 am: 3a716d9b19 
am: daa24df4b4

Change-Id: I92d2dab16426b897e11094b871e1053c2c2afdb1
 2016-08-01 23:10:29 +00:00
Kevin Hufnagle
582fd43b78 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev am: 30583c32e2 
am: 1d785c5bd5

Change-Id: I418ad92b1c605f756b68797315c3121b4ba84d43
 2016-08-01 23:04:32 +00:00
Joe Fernandez
daa24df4b4 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API am: 843f022c47 
am: 3a716d9b19

Change-Id: I4830090cf05a80be67821e904302be2fb33e7032
 2016-08-01 23:04:27 +00:00
Kevin Hufnagle
ddc7ca05a3 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev am: 30583c32e2 
am: 85b3c19fd3

Change-Id: I1a18b2cc8c27cabb15b387421e258d7ea7b96405
 2016-08-01 23:04:19 +00:00
Joe Fernandez
accb3a7dee cherry-pick from mnc-mr-docs: docs: SafeBrowsing API am: 843f022c47 
am: e07150aff2

Change-Id: Ib6c329815a36229d57cd0d984c0583147a6951b0
 2016-08-01 23:04:16 +00:00
Dimitry Ivanov
c58ea7d777 Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 
am: 4e3a78a5ff

Change-Id: I4bbcc38612d49b9dbf81633a75b7f8054e0d7ffb
 2016-08-01 22:58:33 +00:00
Joe Fernandez
85b3c19fd3 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev 
am: 30583c32e2

Change-Id: I67620241a6ad496436af3055bcbb88ec1c946894
 2016-08-01 22:57:43 +00:00
Joe Fernandez
e07150aff2 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API 
am: 843f022c47

Change-Id: I2da29f13d230efef97218198e0efb3719d5d67c3
 2016-08-01 22:57:39 +00:00
Joe Fernandez
1d785c5bd5 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev 
am: 30583c32e2

Change-Id: Ia31bb99a790050e368960ffc59a87bcea734a5d4
 2016-08-01 22:57:24 +00:00
Joe Fernandez
3a716d9b19 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API 
am: 843f022c47

Change-Id: Ia80ff23631080b865e74359c68b039d7d2ea2205
 2016-08-01 22:57:20 +00:00
Kevin Hufnagle
30583c32e2 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev 2016-08-01 22:49:58 +00:00
Dimitry Ivanov
4e3a78a5ff Merge "libsigchain: intercept bsd_signal on lp32" 
am: 6eb30f2060

Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
 2016-08-01 22:46:55 +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
6eb30f2060 Merge "libsigchain: intercept bsd_signal on lp32" 2016-08-01 22:39:16 +00:00
TreeHugger Robot
5fa4754c0c Merge "Removed use of WindowState.mTargetAppToken" 2016-08-01 22:19:04 +00:00