Commit Graph

265533 Commits

Author SHA1 Message Date
Bill Yi
424dacefec Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fc9ad02469 -s ours
am: 3f578ad25e  -s ours

Change-Id: I5c6fef42bf0443d7a451531e311a620d14c0c0dc
2016-08-02 02:17:48 +00:00
Bill Yi
e6620626de Import translations. DO NOT MERGE am: ddd7680cce -s ours
am: d54a4c3273  -s ours

Change-Id: I4fd89a9da6468191d046f6d9730711d6bfa3d5bd
2016-08-02 02:17:44 +00:00
Adam Lesinski
5822fbf2a5 Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev am: 9ff0eed7e8
am: 8cbd88ba91

Change-Id: I2e7e7737e3d0d9cd3e7a6717bf7dc20708f4581a
2016-08-02 02:01:41 +00:00
Adam Lesinski
12e5b87771 AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a
am: 76cbcd495e

Change-Id: I29700574c70f35695ccbdd60c570bb222e1aa0eb
2016-08-02 02:01:37 +00:00
Bill Yi
3f578ad25e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: fc9ad02469  -s ours

Change-Id: If91818c92885e29dcc6f177240b280c92a1359f6
2016-08-02 02:01:36 +00:00
Bill Yi
d54a4c3273 Import translations. DO NOT MERGE
am: ddd7680cce  -s ours

Change-Id: I83ab76fe2b04f02c5169c783b252b432b7e97ea9
2016-08-02 02:01:34 +00:00
Adam Lesinski
8cbd88ba91 Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev
am: 9ff0eed7e8

Change-Id: Iff8206d308755bc63b7d0ab62fe1e5022258f0d4
2016-08-02 01:54:47 +00:00
Adam Lesinski
76cbcd495e AAPT: faketouch feature implied if no touchscreen feature requested.
am: ca955a4c3a

Change-Id: Ieff77e8442893c3f33e2e546857a2c92ecfedf1e
2016-08-02 01:54:42 +00:00
TreeHugger Robot
fc9ad02469 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-02 01:50:59 +00:00
TreeHugger Robot
9ff0eed7e8 Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev 2016-08-02 01:42:37 +00:00
John Reck
dd720d6ba5 Merge "Eliminate recents upload jank" into nyc-mr1-dev am: e733f862f0
am: baf4aa3f84

Change-Id: I9662fd9d10f6af74e14d58b65b99a42bfa94e505
2016-08-02 01:27:48 +00:00
John Reck
897b9effb7 Eliminate recents upload jank am: 4387190d8e
am: 021a952150

Change-Id: I9715db27b6ea265c180f56297815b7240368231f
2016-08-02 01:27:40 +00:00
Android Build Merger (Role)
de146a075f Merge changes from topic 'am-362bf7c96f9743c8bcc779c76a1a5b3f' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 2b318b3a4e am: c7684332ae
  docs: Add ARC documentation TOC file am: 129012530f am: 65521ae7f7
2016-08-02 01:22:23 +00:00
Joe Fernandez
ca6fd01847 Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 2b318b3a4e
am: c7684332ae

Change-Id: Id46e96e3dd0bd87b276c13fe26ac1c0a0b65c0ac
2016-08-02 01:21:40 +00:00
Joe Fernandez
e2a188a049 docs: Add ARC documentation TOC file am: 129012530f
am: 65521ae7f7

Change-Id: I351508654acc6688cf6106c9570a3a17fa8d10ce
2016-08-02 01:21:04 +00:00
John Reck
baf4aa3f84 Merge "Eliminate recents upload jank" into nyc-mr1-dev
am: e733f862f0

Change-Id: I7629c4ea0fa1629569065687668500e169717101
2016-08-02 01:20:53 +00:00
John Reck
021a952150 Eliminate recents upload jank
am: 4387190d8e

Change-Id: I40fd49a61dde974c4215c4ccf9676f84cb3f43a7
2016-08-02 01:20:51 +00:00
Andrii Kulian
90e0f259a6 Merge "Fix finishing activity in non-focused stack" into nyc-mr1-dev am: afc7e8e9ba
am: f5416eb64c

Change-Id: I694e6a8565fffacaf4c04252720753ed420e4594
2016-08-02 01:20:43 +00:00
Andrii Kulian
25a336ae90 Fix finishing activity in non-focused stack am: 995fa2bd2d
am: acecd484b1

Change-Id: Iae0c378e862077bf96369b7e4db038baff385e38
2016-08-02 01:20:40 +00:00
Andrii Kulian
f5416eb64c Merge "Fix finishing activity in non-focused stack" into nyc-mr1-dev
am: afc7e8e9ba

Change-Id: I46e8174a62c46e3df01cea438b868c7e1d7b1b42
2016-08-02 01:15:02 +00:00
Matthew Fritze
dfa414bba5 Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev am: dbfdca3754
am: baada56277

Change-Id: I5187128058129e349e5d5bd97c15df400acb3bbc
2016-08-02 01:15:01 +00:00
Andrii Kulian
acecd484b1 Fix finishing activity in non-focused stack
am: 995fa2bd2d

Change-Id: Ibe58c0934066561847e20367f8c92ae3c4a378e7
2016-08-02 01:14:59 +00:00
Matthew Fritze
7431e85bd6 Lockscreen fingerprint icon error color matches error text. am: debdc8d90e
am: aaf559a77d

Change-Id: I189b98e13cb637439ff81be6b4cdb31e22eb1d2f
2016-08-02 01:14:56 +00:00
Joe Fernandez
01c83702c5 Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 2b318b3a4e am: 74a9b4543e
am: 44209b06ff

Change-Id: I21ae960494cd0864d40c9c94a6e144e7df8f50d4
2016-08-02 01:07:23 +00:00
TreeHugger Robot
e733f862f0 Merge "Eliminate recents upload jank" into nyc-mr1-dev 2016-08-02 01:07:19 +00:00
Joe Fernandez
b46286724f docs: Add ARC documentation TOC file am: 129012530f am: f7355ded9c
am: 4369477b1c

Change-Id: If6312be0c3d6124cfc7795ca0bc40deb8d38c00d
2016-08-02 01:06:38 +00:00
Andrii Kulian
afc7e8e9ba Merge "Fix finishing activity in non-focused stack" into nyc-mr1-dev 2016-08-02 01:04:48 +00:00
Matthew Fritze
baada56277 Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev
am: dbfdca3754

Change-Id: I50d3b2a37658a902a6a95352e7be2cc58813f104
2016-08-02 00:58:01 +00:00
Matthew Fritze
aaf559a77d Lockscreen fingerprint icon error color matches error text.
am: debdc8d90e

Change-Id: I1aa03a0afffe16b308f3fc8612e32916321f33c8
2016-08-02 00:58:00 +00:00
TreeHugger Robot
dbfdca3754 Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev 2016-08-02 00:51:47 +00:00
Yuanlang Song
faef6659d5 Merge "Work around to get ride of NPE in app startup test" into nyc-mr1-dev am: df70593b32
am: a60d742636

Change-Id: Ia8efe3ae1cf67f5af9bae15cf0697d884d7f8122
2016-08-02 00:50:27 +00:00
Yuanlang Song
4dadfe9e72 Work around to get ride of NPE in app startup test am: eaf08cf7d0
am: 832ec72c38

Change-Id: Ia06a591cec41b2546d99411e51741bfdbe5c7886
2016-08-02 00:50:19 +00:00
Joe Fernandez
44209b06ff Merge "docs: Add ARC documentation TOC file" into nyc-dev am: 2b318b3a4e
am: 74a9b4543e

Change-Id: Icb9a6533b1a4731b05445a1aa133118693c0ede6
2016-08-02 00:49:01 +00:00
Joe Fernandez
4369477b1c docs: Add ARC documentation TOC file am: 129012530f
am: f7355ded9c

Change-Id: I49b32256ad0bce25431843662185537fb2dd0e6c
2016-08-02 00:47:44 +00:00
Joe Fernandez
74a9b4543e Merge "docs: Add ARC documentation TOC file" into nyc-dev
am: 2b318b3a4e

Change-Id: I1317b969017e32c0b259a4c7434083d8d3de1cef
2016-08-02 00:39:15 +00:00
Joe Fernandez
f7355ded9c docs: Add ARC documentation TOC file
am: 129012530f

Change-Id: I9c11d114fcfce7ae71cfd84759bc0697a0df919c
2016-08-02 00:39:08 +00:00
Joe Fernandez
c7684332ae Merge "docs: Add ARC documentation TOC file" into nyc-dev
am: 2b318b3a4e

Change-Id: I31072557343554054f7ce2163c2d0485bd36611c
2016-08-02 00:38:51 +00:00
Joe Fernandez
65521ae7f7 docs: Add ARC documentation TOC file
am: 129012530f

Change-Id: Ibd9b721fc87de52f81400936b6fbb8ad1f167fee
2016-08-02 00:38:29 +00:00
Yuanlang Song
a60d742636 Merge "Work around to get ride of NPE in app startup test" into nyc-mr1-dev
am: df70593b32

Change-Id: I57edbba53ef62fd614e9068e9267c2ac2aba5b05
2016-08-02 00:38:13 +00:00
Yuanlang Song
832ec72c38 Work around to get ride of NPE in app startup test
am: eaf08cf7d0

Change-Id: I2ef8cb36261f47055362d4af489f37cc61ddef13
2016-08-02 00:38:08 +00:00
Yuanlang Song
df70593b32 Merge "Work around to get ride of NPE in app startup test" into nyc-mr1-dev 2016-08-02 00:33:50 +00:00
Joe Fernandez
2b318b3a4e Merge "docs: Add ARC documentation TOC file" into nyc-dev 2016-08-02 00:25:18 +00:00
Kevin Hufnagle
7a760d57f5 docs: Updated layout and timestamps of developer stories. am: 997ccdc071 am: 4bb55d7103 am: c5fd6bf769
am: 69b8bb851c

Change-Id: I6e1cf5b6666e93fbb2ed52de43287fbc7417b6ac
2016-08-02 00:21:17 +00:00
Adam Lesinski
ca955a4c3a AAPT: faketouch feature implied if no touchscreen feature requested.
This changes the default implied feature of 'android.hardware.touchscreen'
to 'android.hardware.faketouch' if no 'android.hardware.touchscreen'
feature is requested, required or otherwise.

Bug:30571641
Change-Id: I1e41242d4b1dc549cf69741d2a309baf476d084e
2016-08-01 17:20:28 -07:00
Kevin Hufnagle
478b6d3b31 docs: Updated layout and timestamps of developer stories. am: 997ccdc071 am: 4bb55d7103
am: e4fb88604b

Change-Id: Ia5a9e95618750a72b360669abab7abd49d866f2b
2016-08-02 00:15:57 +00:00
Kevin Hufnagle
69b8bb851c docs: Updated layout and timestamps of developer stories. am: 997ccdc071 am: 4bb55d7103
am: c5fd6bf769

Change-Id: I3b07c85aae07014c4f35e0b55767c8ab22f42355
2016-08-02 00:14:50 +00:00
Bill Yi
ddd7680cce Import translations. DO NOT MERGE
Change-Id: I0aeff308769f38a68b6bbfd0bac88d8f74b76f8e
Auto-generated-cl: translation import
2016-08-01 17:12:41 -07:00
Kevin Hufnagle
e4fb88604b docs: Updated layout and timestamps of developer stories. am: 997ccdc071
am: 4bb55d7103

Change-Id: Ia09d64994190df697fe25112e010d986937b267f
2016-08-02 00:10:25 +00:00
Kevin Hufnagle
c5fd6bf769 docs: Updated layout and timestamps of developer stories. am: 997ccdc071
am: 4bb55d7103

Change-Id: Iebcf52cf4ec1fe0eccf51f4f6dc48bf9a54d149a
2016-08-02 00:10:14 +00:00
Kevin Hufnagle
7b4078d705 Merge "docs: Updated layout and timestamps of developer stories." into nyc-dev am: 7ba0b437cf am: bda3c7d9f8
am: 18bef66f3b

Change-Id: I2eda136d661b7a6f583adc7207ac984f27c0bad4
2016-08-02 00:04:16 +00:00