Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272,294 Commits 3 Branches 0 Tags
03e5dfd3a3dd09891f6d3dcd4a8168fab1843970
Commit Graph

272294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mary Yanchar
03e5dfd3a3 Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09 
am: 140c793b0c

Change-Id: Ifec0b1ec8e8b4b65678f1c00788d567db1e33e8b
 2016-09-20 21:51:31 +00:00
Android Build Merger (Role)
05388c5918 Merge "Small change for new sample test code am: acb3eb39da am: be34171986" into nyc-mr1-dev-plus-aosp 2016-09-20 21:48:01 +00:00
Mary Yanchar
7213b102a2 Small change for new sample test code am: acb3eb39da 
am: be34171986

Change-Id: I65098de4c99176ae306acd5e4c2691af42febd3a
 2016-09-20 21:47:11 +00:00
Mary Yanchar
36cda37d6e Small change for new sample test code am: acb3eb39da am: 2fba2c8c1b am: 4b830c5a70 
am: 33183bd591

Change-Id: I156ab2581d8c8c4cc425407a5fb3041f3797700c
 2016-09-20 21:47:05 +00:00
Scott Main
7214cdc6d5 Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 am: 1c944335cb am: 20c5ca92c3 
am: ed35be73c9

Change-Id: If62203657d18a9583be73de45a4127097dadc0a9
 2016-09-20 21:42:58 +00:00
Dianne Hackborn
b0c9df542f A little more on issue #30766518: Document what targeting N does am: da6be5b871 am: c8bf8951c2 am: 4f6e7f148d 
am: 365e236c29

Change-Id: I2c386d01d8c2f9c0e2417fbfb84a326fc90c3fd2
 2016-09-20 21:41:41 +00:00
Android Build Merger (Role)
eb986be871 Merge changes from topic 'am-7d2bafcf975f4cb0beff18b39455308b' into nyc-mr1-dev-plus-aosp 
* changes:
  Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 am: 9340130a5e
  A little more on issue #30766518: Document what targeting N does am: da6be5b871 am: 3da7e4e563
  Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6 am: bae14052a0  -s ours
 2016-09-20 21:26:15 +00:00
Scott Main
ab9a4661fa Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 
am: 9340130a5e

Change-Id: If00a867cc94d2c2dcd225e583a95a1b4266f656e
 2016-09-20 21:24:43 +00:00
Dianne Hackborn
27f0b619c4 A little more on issue #30766518: Document what targeting N does am: da6be5b871 
am: 3da7e4e563

Change-Id: I01415cb768459dc68b5f74cad00d9449a2fb9a85
 2016-09-20 21:22:46 +00:00
Dianne Hackborn
83ab9f9802 Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6 
am: bae14052a0  -s ours

Change-Id: I48e9ceff6226b222c1fe83bdc670edfeea0dfa7d
 2016-09-20 21:21:42 +00:00
smain@google.com
cadce4fe3d Merge "resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc" into nyc-mr1-dev am: af5f7d8e97 
am: 2c79e3d5e5

Change-Id: I969a9873408c2ec22090bd654eff29dd9f81ef00
 2016-09-20 21:21:38 +00:00
smain@google.com
735303b5e1 resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc am: e609ec63f0 
am: db2fce2c30

Change-Id: I3ab5a8406e09724be0ef757fb62b44df8d02ba8f
 2016-09-20 21:15:41 +00:00
Mary Yanchar
33183bd591 Small change for new sample test code am: acb3eb39da am: 2fba2c8c1b 
am: 4b830c5a70

Change-Id: I09a919da175b4e5a943ab3e6befb743b41f10d83
 2016-09-20 21:14:09 +00:00
Scott Main
ed35be73c9 Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 am: 1c944335cb 
am: 20c5ca92c3

Change-Id: I598cc20e11549d8d0f5f149fe4a711a9ba393e0a
 2016-09-20 21:08:59 +00:00
Jason Monk
0991791dce Merge "Protect against crash on user switch" into nyc-mr1-dev am: 1ec6ccdafc 
am: 9192902fb4

Change-Id: Ic3ef1a011243dc3af5ff9b9f5f8e87c8713e5203
 2016-09-20 21:08:15 +00:00
Dianne Hackborn
365e236c29 A little more on issue #30766518: Document what targeting N does am: da6be5b871 am: c8bf8951c2 
am: 4f6e7f148d

Change-Id: I53ee90e2da4174f178ec73e7a10930ce0c4b4ea3
 2016-09-20 21:07:57 +00:00
Jason Monk
6140dfe5b1 Protect against crash on user switch am: 6e6af2c7ee 
am: b7218524bc

Change-Id: I53e6997e903c109e2584e8be5674d17515c86e0c
 2016-09-20 21:06:02 +00:00
Vadim Tryshev
1e707316bc Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev am: 0ef6986379 
am: a6cbf1f668

Change-Id: Ic4c850970fd6dc7fab9aa8f2fb79a6fb44ab11c3
 2016-09-20 21:03:00 +00:00
Mary Yanchar
4b830c5a70 Small change for new sample test code am: acb3eb39da 
am: 2fba2c8c1b

Change-Id: I07502f5d1234d9b62836624777d4c5b015b10158
 2016-09-20 21:00:05 +00:00
Vadim Tryshev
72193e13c5 For pre-N apps, keep entered all parents of an drag-entered child. am: ef12811560 
am: f0550a6bd1

Change-Id: Ic22cb6624a12188992fa5f1712ba2915c82bd457
 2016-09-20 20:59:40 +00:00
smain@google.com
2c79e3d5e5 Merge "resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc" into nyc-mr1-dev 
am: af5f7d8e97

Change-Id: I673e842cc534209ced68747a1a1fdab4db00aa6c
 2016-09-20 20:58:28 +00:00
smain@google.com
db2fce2c30 resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc 
am: e609ec63f0

Change-Id: Iba5e52990846cead75e4ada03b9cf6c7a2fe8486
 2016-09-20 20:58:26 +00:00
Jason Monk
9192902fb4 Merge "Protect against crash on user switch" into nyc-mr1-dev 
am: 1ec6ccdafc

Change-Id: I2edf21711175ac334d4af82ac93c324eed6a1ae8
 2016-09-20 20:53:36 +00:00
Jason Monk
b7218524bc Protect against crash on user switch 
am: 6e6af2c7ee

Change-Id: Ife9ab7d026e242e229fb304cdd2d522e78a570dc
 2016-09-20 20:53:33 +00:00
Chris Tate
b6d4c7a7dd Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev am: e6fe1287c9 
am: 21810b1dbf

Change-Id: I432b1b3f0539d4ec7b590573229a2f58a29e83f9
 2016-09-20 20:53:26 +00:00
Christopher Tate
ff7290b600 Always store wallpaper metadata to backup am: a611fdc66b 
am: 3211545509

Change-Id: I13f6d6f7669d00b662de65d963da85878368b5da
 2016-09-20 20:48:46 +00:00
Scott Main
20c5ca92c3 Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 
am: 1c944335cb

Change-Id: I1ba8c5bc910bb4727ed59b8e758c7e94006e98df
 2016-09-20 20:48:43 +00:00
Vadim Tryshev
a6cbf1f668 Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev 
am: 0ef6986379

Change-Id: I3b504ca92e8354af64c7e19d9ae64ba164157948
 2016-09-20 20:48:40 +00:00
Mary Yanchar
2fba2c8c1b Small change for new sample test code 
am: acb3eb39da

Change-Id: I72196654f922a7ef46ab5903e1bd7f9409330076
 2016-09-20 20:48:36 +00:00
Vadim Tryshev
f0550a6bd1 For pre-N apps, keep entered all parents of an drag-entered child. 
am: ef12811560

Change-Id: Ia086b1525d658d3374174e11a0a06551b8e4910a
 2016-09-20 20:48:36 +00:00
Dianne Hackborn
4f6e7f148d A little more on issue #30766518: Document what targeting N does am: da6be5b871 
am: c8bf8951c2

Change-Id: I83fd73bbda973de2667631dc77fc06b83051bc4e
 2016-09-20 20:47:48 +00:00
Jason Monk
12c95006c0 Merge "Fix data disabled icons in RTL" into nyc-mr1-dev am: e4a53a3677 
am: 70fc5b1bf4

Change-Id: I8bc4f0e55033dfce365944232e1d8874063834c2
 2016-09-20 20:39:04 +00:00
Android Build Merger (Role)
af5f7d8e97 Merge "resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc" into nyc-mr1-dev 2016-09-20 20:34:38 +00:00
Chris Tate
21810b1dbf Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev 
am: e6fe1287c9

Change-Id: I89421602b290ba7f354cb7312fe971d1f3248889
 2016-09-20 20:34:10 +00:00
Christopher Tate
3211545509 Always store wallpaper metadata to backup 
am: a611fdc66b

Change-Id: I16566a7965beeb780367723e3572c32ce841db55
 2016-09-20 20:34:07 +00:00
smain@google.com
e609ec63f0 resolve merge conflicts of 491bc2b to nyc-dr1-dev 
am: 45bf970ebc

Change-Id: I12ce82b5faa5fc050e7f30b3aae06e9f022d36f0
 2016-09-20 20:33:57 +00:00
Jason Monk
d3dd5bd672 Fix data disabled icons in RTL am: a138395cc8 
am: 200e9e5a2b

Change-Id: I15a87140c178a8c3a77fa4d524943e7f9a41bf37
 2016-09-20 20:33:46 +00:00
Scott Main
1c944335cb Merge changes from topic 'n-versioncode' into nyc-dev 
am: 99ec81ab46

Change-Id: I9b658d156929e6d958bc517d4fc38c8cd987eb2f
 2016-09-20 20:33:06 +00:00
TreeHugger Robot
1ec6ccdafc Merge "Protect against crash on user switch" into nyc-mr1-dev 2016-09-20 20:33:05 +00:00
Dianne Hackborn
c8bf8951c2 A little more on issue #30766518: Document what targeting N does 
am: da6be5b871

Change-Id: I6d08893a3190e7f92c56f4b220e79e8310bb0b2e
 2016-09-20 20:33:01 +00:00
TreeHugger Robot
0ef6986379 Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev 2016-09-20 20:27:25 +00:00
Jason Monk
70fc5b1bf4 Merge "Fix data disabled icons in RTL" into nyc-mr1-dev 
am: e4a53a3677

Change-Id: I24e64f102797a1c97da2bd340f16a4e193252c3c
 2016-09-20 20:19:32 +00:00
Jason Monk
200e9e5a2b Fix data disabled icons in RTL 
am: a138395cc8

Change-Id: I95498824df46150e7bf6624712214253498ab959
 2016-09-20 20:19:29 +00:00
Chris Tate
e6fe1287c9 Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev 2016-09-20 20:08:15 +00:00
TreeHugger Robot
e4a53a3677 Merge "Fix data disabled icons in RTL" into nyc-mr1-dev 2016-09-20 20:04:09 +00:00
Jason Monk
6e6af2c7ee Protect against crash on user switch 
Somehow one of the tiles doesn't have a view yet. Assume that this
is a transient part of the tiles getting recreated and that the skipped
tile will get picked up in the next layout.

Change-Id: Ia1370d66119bfcfa7b00bd087bcb0d72a072666a
Fixes: 31394359
 2016-09-20 14:53:28 -04:00
Doris Ling
9140db194f Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev am: b4b96040e0 
am: 5452f047a8

Change-Id: Icf53300cfb7cca86f6c1a9c257eb777aacc0c368
 2016-09-20 18:48:20 +00:00
Doris Ling
4c25818533 Add secure settings for Ambient Display pick up and double tap gestures. am: 6403b4050f 
am: 6591ac6381

Change-Id: I67f40251da88b4e2161a1ff591cc1383079013c0
 2016-09-20 18:46:19 +00:00
Doris Ling
5452f047a8 Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev 
am: b4b96040e0

Change-Id: Ib86d3ea45b69e1c36b36356817cc12803f950361
 2016-09-20 18:41:05 +00:00
Doris Ling
6591ac6381 Add secure settings for Ambient Display pick up and double tap gestures. 
am: 6403b4050f

Change-Id: I35832dc785c1570b5243910309d029ce3c8af2bc
 2016-09-20 18:41:03 +00:00