Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,778 Commits 3 Branches 0 Tags
7339bbaca004353fc6a13ca4469ebb9db9799eb0
Commit Graph

49051 Commits

Author SHA1 Message Date
Johnson Hsieh
7339bbaca0 am 38e36f12: am 81188176: am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '38e36f1210296bc799d3b3800f5c64691898c3da':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:30:36 +00:00
Johnson Hsieh
38e36f1210 am 81188176: am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '811881763470c5406645871d657cf88e97faf552':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:19:11 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Filip Gruszczynski
5aeeda0727 am 38b6cac4: am 0f5d0d54: am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '38b6cac44787bb663a4bde0932421860097b21b9':
  ActivityView: set surface on a background thread.
 2015-06-05 02:55:43 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java. 
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
 2015-06-04 19:51:52 -07:00
Filip Gruszczynski
38b6cac447 am 0f5d0d54: am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '0f5d0d54d452b60a039c365a1de13e1aed5426e6':
  ActivityView: set surface on a background thread.
 2015-06-05 02:43:44 +00:00
Clara Bayarri
3d5a78aa40 am acc6fc50: am fee163c5: am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'acc6fc509e2f45bfbb2a9d148a7e61a378f18b3e':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:43:30 +00:00
Clara Bayarri
acc6fc509e am fee163c5: am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'fee163c5db14b9d6df65dd7b26ab4e1f02551fd3':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:31:40 +00:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
 2015-06-05 02:18:35 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All 
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
 2015-06-05 03:03:31 +01:00
Zhijun He
7d9ad7ca43 am c7023f1c: am 427a0216: am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev 
* commit 'c7023f1cf066576a2ed530436bd6b64087f9b2f5':
  Camera2: implement high speed video APIs
 2015-06-05 01:50:12 +00:00
Zhijun He
c7023f1cf0 am 427a0216: am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev 
* commit '427a0216b47276fe1891289d63a7f122c0d64dd6':
  Camera2: implement high speed video APIs
 2015-06-05 01:35:49 +00:00
Doris Liu
3dd9a25e61 am d8fa6c3a: am 6e941351: am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit 'd8fa6c3aeccf8be0f54ab2a8b4778c896cbc0546':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:27:32 +00:00
Clara Bayarri
b1d4d77d6a am 612e1da8: am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit '612e1da808b327aba06be883a54dc08f9afd6dd2':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:18:32 +00:00
Doris Liu
d8fa6c3aec am 6e941351: am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit '6e94135180b0d21a1559e3c0f789771f152dfada':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:16:09 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Clara Bayarri
612e1da808 am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit 'f407aa302788c7a5a885e069fd169b6a18a9bcbb':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:06:23 +00:00
Wale Ogunwale
549d16eaab am f318db78: am bb2a990b: am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit 'f318db78c27dc5b4037f8208ee8b0dd4ee714e9f':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 01:02:44 +00:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Wale Ogunwale
f318db78c2 am bb2a990b: am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit 'bb2a990bda622e0f13cf4d33cf8fe0d2c2756e07':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 00:50:59 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag 
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
 2015-06-04 17:50:47 -07:00
Johnson Hsieh
1ddd35c454 am 01f77af0: am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '01f77af0480a07e1a6420d9d9d7efaa52b5a933d':
  Updates AlarmClock intent API.
 2015-06-05 00:49:01 +00:00
Yohei Yukawa
42c0ef452f am c225c81b: am 8d38afdd: am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 
* commit 'c225c81b13e700fd96c5c0a128931de46c421c27':
  Report EditorInfo#packageName based on the actual uid.
 2015-06-05 00:48:49 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Johnson Hsieh
01f77af048 am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '37750c281104435b5d0dc39fc0cde4fce312f6f4':
  Updates AlarmClock intent API.
 2015-06-04 23:59:45 +00:00
Yohei Yukawa
c225c81b13 am 8d38afdd: am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 
* commit '8d38afddb12047c79d56ed8103341be166a3d6c7':
  Report EditorInfo#packageName based on the actual uid.
 2015-06-04 23:37:58 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Yohei Yukawa
4493017abb Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 2015-06-04 23:12:45 +00:00
Tim Kilbourn
9603852e08 am 9c76cfae: am 57914802: Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev 
* commit '9c76cfae296e15bfe6d1f95d161ac294d7493380':
  DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
 2015-06-04 23:07:53 +00:00
Zhijun He
a767772230 Camera2: implement high speed video APIs 
Bug: 21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
 2015-06-04 15:22:00 -07:00
Jeff Brown
fe797dde85 am 6ff2e0c6: am 017efadc: am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev 
* commit '6ff2e0c647dad23bf527e57d56dc8755c45c7560':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:42:10 +00:00
Tim Kilbourn
4bf27b53b9 DO NOT MERGE Fix DropBoxManager.Entry parcels with fds. 
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
(cherry picked from commit ba953230f7)
 2015-06-04 21:37:50 +00:00
Jeff Brown
6ff2e0c647 am 017efadc: am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev 
* commit '017efadc2e5a77bdd9b6ad699d4ff1ccaaf43b42':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:30:43 +00:00
Eino-Ville Talvala
df4f22ff31 am 51db0244: am def679d0: am 05ae9b56: Merge "Camera: Change origin of poseTranslation." into mnc-dev 
* commit '51db02446c690880784ee591b0b1b55bb43fe912':
  Camera: Change origin of poseTranslation.
 2015-06-04 21:25:24 +00:00
Ruben Brunk
e7bae8cb89 am 9ff782f2: am 557fab42: am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev 
* commit '9ff782f2551898419cc0be0641cf243f7367df30':
  Fix CameraManager#open exception handling.
 2015-06-04 21:22:17 +00:00
Jeff Brown
16422b25f7 Merge changes If241e329,Ib69b6987 into mnc-dev 
* changes:
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:11:05 +00:00
Eino-Ville Talvala
51db02446c am def679d0: am 05ae9b56: Merge "Camera: Change origin of poseTranslation." into mnc-dev 
* commit 'def679d05ad7412d634b79cb46b314b6cd118919':
  Camera: Change origin of poseTranslation.
 2015-06-04 21:09:24 +00:00
Ruben Brunk
9ff782f255 am 557fab42: am 74fc1837: Merge "Fix CameraManager#open exception handling." into mnc-dev 
* commit '557fab42fae1347bd9137a376747a8fbd7612103':
  Fix CameraManager#open exception handling.
 2015-06-04 21:09:13 +00:00
Eino-Ville Talvala
70162cc975 am e2ab7a29: am 0207367c: am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 
* commit 'e2ab7a29c4da2e6ec1da460179a59aa0f365e383':
  CameraManager: Ensure all public methods connect to camera service.
 2015-06-04 20:56:07 +00:00
Eino-Ville Talvala
05ae9b56ae Merge "Camera: Change origin of poseTranslation." into mnc-dev 2015-06-04 20:52:02 +00:00
Ruben Brunk
74fc1837e0 Merge "Fix CameraManager#open exception handling." into mnc-dev 2015-06-04 20:43:16 +00:00
Eino-Ville Talvala
d3dbfb3f75 Camera: Change origin of poseTranslation. 
No actual defined center for the Android sensor coordinate system
exists, so define the translation relative to the largest camera
device facing the same way.

Bug: 20123879
Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
 2015-06-04 13:41:56 -07:00
Adam Powell
7404c99683 am be899a3c: am cce32a82: am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 
* commit 'be899a3cde7576feb975ddf5f860f21fd60e5f3a':
  Make WindowInsets#hasInsets check for stable insets as well
 2015-06-04 20:39:32 +00:00
Eino-Ville Talvala
e2ab7a29c4 am 0207367c: am ea7547f1: Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 
* commit '0207367c5f41ed2bee9cee0eb131e695e80db81d':
  CameraManager: Ensure all public methods connect to camera service.
 2015-06-04 20:39:14 +00:00
Adam Powell
dd3cda73ff am 1cf4c2c3: am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '1cf4c2c3b62e4b3a193b809191348896f6f413fe':
  Add DENSITY_360
 2015-06-04 20:39:14 +00:00
Adam Powell
be899a3cde am cce32a82: am 1da56b51: Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-dev 
* commit 'cce32a829054a9ba4d5dd8774ead9d1ef6c92017':
  Make WindowInsets#hasInsets check for stable insets as well
 2015-06-04 20:20:55 +00:00
Adam Powell
1cf4c2c3b6 am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '8e44ec0ec2c387b12b539715a7747513f874d22d':
  Add DENSITY_360
 2015-06-04 20:20:38 +00:00
Eino-Ville Talvala
ea7547f155 Merge "CameraManager: Ensure all public methods connect to camera service." into mnc-dev 2015-06-04 20:13:41 +00:00
Eino-Ville Talvala
2ef01737af CameraManager: Ensure all public methods connect to camera service. 
Otherwise, registerAvailabilityCallback won't actually cause caller to
receive callbacks, if no other methods on CameraManager are ever
invoked.

Bug: 21536556
Change-Id: I5cded8a59846a971d6272ac3bced44678a533165
 2015-06-04 12:58:01 -07:00