Commit Graph

254385 Commits

Author SHA1 Message Date
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Jorim Jaggi
1e630c0829 Fix transition delay tracking when starting activity from recents
- Move logic to determine app switch etc. into ActivityMetricsLogger.
- Make sure the notify the tracker in startActivityFromRecentsInner

Bug: 27295491
Change-Id: Ic68058c88917e3f37183dded2f13cb35055323ee
2016-05-16 21:18:04 +00:00
Andrew Solovay
8804495bff docs: Minor permissions phrasing tweak am: 9acd851ee6
am: 072b6fb839

* commit '072b6fb83928120de268a1e59ebabb7f2a5c724a':
  docs: Minor permissions phrasing tweak

Change-Id: I90d66b9c745bb6f313a074c9d4b4c94a8319dbc3
2016-05-16 21:16:06 +00:00
Andrew Solovay
072b6fb839 docs: Minor permissions phrasing tweak
am: 9acd851ee6

* commit '9acd851ee6071fa82a725a69d75c59bf4068a83a':
  docs: Minor permissions phrasing tweak

Change-Id: I823cc460ffbf71fce9013967046076f937af3168
2016-05-16 21:13:13 +00:00
TreeHugger Robot
8c60dbe3ca Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 2016-05-16 21:13:05 +00:00
Andrew Solovay
be2b224d80 docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94
am: af9dc9292b

* commit 'af9dc9292b552e189c43596658b0f09b052493af':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Id5866a8ce27407924508703292a223a4f0399cb3
2016-05-16 21:11:04 +00:00
Andrew Solovay
af9dc9292b docs: Removed note that GET_ACCOUNTS was deprecated
am: cc80393d94

* commit 'cc80393d94e53bc92f70e2d306ad87a92ff83794':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Icc2579926a473f72236837fb94a68fbf16494478
2016-05-16 21:08:05 +00:00
Andrew Solovay
9acd851ee6 docs: Minor permissions phrasing tweak
Meant to make this change in a preceding CL but accidentally
submitted before uploading the last patch set.

bug: 28727522
Change-Id: Iecf2e00031d98efbb2a8e2bf0e9386ac8707b48b
2016-05-16 14:06:19 -07:00
Felipe Leme
c9c7be58a5 Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Dianne Hackborn
2ebd57ff94 Fix issue #28794831: meminfo considers cached processes to be services
Uh how did this ever actually work??

Change-Id: I9823f88847ccda6984bc95227fac90b994c22462
2016-05-16 13:55:24 -07:00
Dirk Dougherty
9ae42db319 Update default image for n preview docs. Update tools resources.
Change-Id: I25dcaa9ad0a0b44e84aff49a08481b643b03ea28
2016-05-16 13:55:23 -07:00
Chris Craik
3741328947 Fix hw layer overdraw/update visualization
Fixes: 28748255

Change-Id: I83b531cdf5e4407fd17edd72d96e6189924926fa
2016-05-16 13:54:02 -07:00
Hans Boehm
0d65743fea Clear more native pointers in finalizers
This hopefully handles the remaining finalizers in frameworks/base
that didn't guard against calls from other finalizers after being
finalized.

The goal here is to reduce the possible corruption causes we have
to think about by a few.

If any of theses are either very frequently used, or use large
Java (as opposed to native) objects, we should probably convert them
to NativeAllocationRegistry instead. But that's more work.

Bug: 18178237
Change-Id: I79bc0e8fa20af8f340418a6226022e0294d77f02
(cherry picked from commit ad3cc3c63c)
2016-05-16 13:45:21 -07:00
Ta-wei Yen
655041ef5a Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev
am: ca2da6dc33

* commit 'ca2da6dc3332bb657e4927b837e5bc15a6e119cb':
  Add visual voicemail SMS filter APIs

Change-Id: I8b124c6a22e473f760e29be8d79843ec55122bb7
2016-05-16 20:43:01 +00:00
Billy Lamberta
e1277eb819 docs: work minisite
Adds minisite at docs/html/work. Adds landing page and
Android for Work specific guides. Moves docs from
training/enterprise and add redirects. Update resource
card info and add new images. Update sitemap, _book, and
add sidebar navigation menu.

bug: 27744376
Change-Id: Ib09f7fc6352dfde7a60fc674b06488c651b196e2
2016-05-16 13:36:55 -07:00
Ta-wei Yen
ca2da6dc33 Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev 2016-05-16 20:36:37 +00:00
Felipe Leme
99d5d3d775 Added a onRestrictBackgroundBlacklistChanged() callback.
When an UID is added / removed to the Data Saver blacklist, it's
necessary to notify internal components such as the Settings UI (which
was erroneously listening to UID rules changes instead).

BUG: 28743623
BUG: 28791717

Change-Id: I11c85e141dfe074ad390fd324309d2412bfbbd45
2016-05-16 13:30:57 -07:00
Fyodor Kupolov
b45d9833aa Delay grantDefaultPermissions until user's first start
Bug: 28765487
Change-Id: I6a7b0a9fc85964def1e991aafe967977080dfdab
2016-05-16 13:25:34 -07:00
Julia Reynolds
04132ed420 Adjust spacing.
Bug: 27597108
Change-Id: I75db314162cf0293422bdea6ef5e931a3ee7f813
2016-05-16 16:19:02 -04:00
Android Build Merger (Role)
da18d8b4ed Merge "Merge "Added scheduleWritePackageListLocked" into nyc-dev am: a7b826b08a am: e47ebb554c" into nyc-mr1-dev-plus-aosp 2016-05-16 20:16:06 +00:00
Fyodor Kupolov
09ab251950 Merge "Added scheduleWritePackageListLocked" into nyc-dev am: a7b826b08a
am: e47ebb554c

* commit 'e47ebb554cce5ee6f3c9a841eba4e93918420784':
  Added scheduleWritePackageListLocked

Change-Id: I4b638d493085f89e0012c434313c9dd5a8b7b5f3
2016-05-16 20:15:39 +00:00
Fyodor Kupolov
3b2ba4ee5f Merge "Added scheduleWritePackageListLocked" into nyc-dev am: a7b826b08a
am: 46bda6e471

* commit '46bda6e471fe1b0018ea4d9b98cf1b794dee8583':
  Added scheduleWritePackageListLocked

Change-Id: Ia49d21a951316a319733d33bb1bcf2b24727632c
2016-05-16 20:15:38 +00:00
Fyodor Kupolov
e47ebb554c Merge "Added scheduleWritePackageListLocked" into nyc-dev
am: a7b826b08a

* commit 'a7b826b08aa1b185b0e46b648e5c2ed7f818ae09':
  Added scheduleWritePackageListLocked

Change-Id: Ie6642a2bc103c1691659750b93657b4082b6273e
2016-05-16 20:11:16 +00:00
Fyodor Kupolov
46bda6e471 Merge "Added scheduleWritePackageListLocked" into nyc-dev
am: a7b826b08a

* commit 'a7b826b08aa1b185b0e46b648e5c2ed7f818ae09':
  Added scheduleWritePackageListLocked

Change-Id: Ib693f0c9ae8d23719185c40b5c50a676aa8d8889
2016-05-16 20:11:06 +00:00
Fyodor Kupolov
a7b826b08a Merge "Added scheduleWritePackageListLocked" into nyc-dev 2016-05-16 20:05:10 +00:00
Vladislav Kaznacheev
c244970220 Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Make getX/getY return view-relative position as specified in the class
JavaDoc.

Fix obvious errors in JavaDoc for getX/getY

Bug: 28793547
Change-Id: Ic2ac646189711e7466594d4fc8326408fc0348e1
2016-05-16 12:57:15 -07:00
Android Build Merger (Role)
5ba1b87f30 Merge "Merge "Use the correct handler when persisting the settings state." into nyc-dev am: 967fcfa593 am: 8d761fb452" into nyc-mr1-dev-plus-aosp 2016-05-16 19:55:31 +00:00
Android Build Merger (Role)
8994ed58bb Merge "Merge "Fixed the remove animations for notification children" into nyc-dev am: 37a4027131 am: a19827a51d" into nyc-mr1-dev-plus-aosp 2016-05-16 19:55:21 +00:00
Phil Weaver
e6269c3f1d Hide UiAutomation#destroy as test api.
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Svetoslav Ganov
1db5c20960 Merge "Use the correct handler when persisting the settings state." into nyc-dev am: 967fcfa593
am: 23d729deb8

* commit '23d729deb8d78d5806dec60453174ccfa28b843d':
  Use the correct handler when persisting the settings state.

Change-Id: I1e6002fd970f9eda095a6c1c17f09937cee67aaf
2016-05-16 19:54:37 +00:00
Svetoslav Ganov
06f4719e31 Merge "Use the correct handler when persisting the settings state." into nyc-dev am: 967fcfa593
am: 8d761fb452

* commit '8d761fb4529a11bdc717634de6f87d4d8710ae7f':
  Use the correct handler when persisting the settings state.

Change-Id: I06f428eeb84069797736ba85437f2b8dff1aeb0a
2016-05-16 19:54:35 +00:00
Selim Cinek
caa78d7d59 Merge "Fixed the remove animations for notification children" into nyc-dev am: 37a4027131
am: 89374b9591

* commit '89374b9591c5754b6219fc6fa0bed01dfd36fa91':
  Fixed the remove animations for notification children

Change-Id: I466cd962e915051563f9307f8b6885ae5b910812
2016-05-16 19:54:31 +00:00
Selim Cinek
60e966fbd9 Merge "Fixed the remove animations for notification children" into nyc-dev am: 37a4027131
am: a19827a51d

* commit 'a19827a51d6ee0a0ef9f2e8f807f32db4ea9bd07':
  Fixed the remove animations for notification children

Change-Id: Ibc899269ddaf078e7d0d44c8dc0c13ec042c9b45
2016-05-16 19:54:30 +00:00
Svetoslav Ganov
8d761fb452 Merge "Use the correct handler when persisting the settings state." into nyc-dev
am: 967fcfa593

* commit '967fcfa5939403017a6edc6d365b2996b915685d':
  Use the correct handler when persisting the settings state.

Change-Id: I6939635dfc93015c4625e50b6431ceb850cfbd1a
2016-05-16 19:50:00 +00:00
Svetoslav Ganov
23d729deb8 Merge "Use the correct handler when persisting the settings state." into nyc-dev
am: 967fcfa593

* commit '967fcfa5939403017a6edc6d365b2996b915685d':
  Use the correct handler when persisting the settings state.

Change-Id: I53fea39e5097512f080f62f3510cc6c7acf87e3c
2016-05-16 19:49:55 +00:00
Selim Cinek
a19827a51d Merge "Fixed the remove animations for notification children" into nyc-dev
am: 37a4027131

* commit '37a4027131f80709c27a81be0b426b60d33dd6c7':
  Fixed the remove animations for notification children

Change-Id: I4220bfbd9fdb7013ad8b959c2e0e72efd5867821
2016-05-16 19:49:54 +00:00
Selim Cinek
89374b9591 Merge "Fixed the remove animations for notification children" into nyc-dev
am: 37a4027131

* commit '37a4027131f80709c27a81be0b426b60d33dd6c7':
  Fixed the remove animations for notification children

Change-Id: I31ac58e09ac980df5008e87b46c0d268d93fabe5
2016-05-16 19:49:53 +00:00
Svetoslav Ganov
967fcfa593 Merge "Use the correct handler when persisting the settings state." into nyc-dev 2016-05-16 19:46:31 +00:00
Android Build Merger (Role)
855be028a7 Merge "Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4 am: f10697e17b" into nyc-mr1-dev-plus-aosp 2016-05-16 19:45:43 +00:00
Android Build Merger (Role)
3d4ff60526 Merge "Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b am: 97306713fe" into nyc-mr1-dev-plus-aosp 2016-05-16 19:45:25 +00:00
Alan Viverette
8652094a60 Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4
am: f10697e17b

* commit 'f10697e17bf4ad2ebd97107483f0fbf232d5e797':
  Update docs for ColorStateList to include alpha

Change-Id: I57f26cc06b99297c0d278d54a97d652a3518a0bc
2016-05-16 19:44:56 +00:00
Alan Viverette
d7eda0d020 Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b
am: 97306713fe

* commit '97306713fef6ce0ba2fc29cf560af22612a3ba11':
  Use standalone capitalization for month labels

Change-Id: Iedc6e1133854b50e2bb7f48405f964923d42ca31
2016-05-16 19:44:52 +00:00
Alan Viverette
c46f3a4fe9 Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4
am: 3818d32374

* commit '3818d32374374f568805a9a5eb7c4468aec78862':
  Update docs for ColorStateList to include alpha

Change-Id: Ife972ac77358719a78c6ead2c2866e8de84e722e
2016-05-16 19:44:48 +00:00
Alan Viverette
a9c50001aa Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b
am: cee6b62ce8

* commit 'cee6b62ce80b1c8f67cf18658768a94fef6e94da':
  Use standalone capitalization for month labels

Change-Id: I2547ae9f4b21fe6be093023eb35f57c1b1eaff54
2016-05-16 19:44:46 +00:00
Selim Cinek
37a4027131 Merge "Fixed the remove animations for notification children" into nyc-dev 2016-05-16 19:44:34 +00:00
Alan Viverette
3818d32374 Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: Ibb7c034061ec5c6b540e44ca856bed2624c14629
2016-05-16 19:40:47 +00:00
Alan Viverette
cee6b62ce8 Merge "Use standalone capitalization for month labels" into nyc-dev
am: 895241170b

* commit '895241170b017235faf9a6a77afd22b12209bce6':
  Use standalone capitalization for month labels

Change-Id: I313042aaf507d5f4a23d3e261354d836b7bdfb0a
2016-05-16 19:40:37 +00:00
Alan Viverette
f10697e17b Merge "Update docs for ColorStateList to include alpha" into nyc-dev
am: 5bcf7650b4

* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
  Update docs for ColorStateList to include alpha

Change-Id: I1dc16f964509cec422622da2ac60e5428b8203f6
2016-05-16 19:40:26 +00:00
Alan Viverette
97306713fe Merge "Use standalone capitalization for month labels" into nyc-dev
am: 895241170b

* commit '895241170b017235faf9a6a77afd22b12209bce6':
  Use standalone capitalization for month labels

Change-Id: I881afd0f2decf329e11e103c92dc54584b91ac54
2016-05-16 19:40:23 +00:00
Svetoslav Ganov
9205749cfe Use the correct handler when persisting the settings state.
bug:28784358

Change-Id: Iba9d569bae67c7ba0c3ab0a486ae14efa84a7acf
2016-05-16 12:36:48 -07:00