Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,922 Commits 3 Branches 0 Tags
9933b3136e3fa2e04e5ddd363933e237643ea962
Commit Graph

45237 Commits

Author SHA1 Message Date
Chris Craik
b018835dc7 am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
automerge: 2da67b5

* commit '2da67b570c91a831550fee32f778e2a60055e0d8':
  Invalidate outline on padding update
 2015-01-27 17:53:00 +00:00
Alan Viverette
2a05ae733b resolve merge conflicts of da9653a to master. 
Change-Id: I51a1056b36015986d7e55aa38d658b547c2446e1
 2015-01-27 09:48:47 -08:00
Chris Craik
2da67b570c am 00c53d66: am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit '00c53d66dd56384aff834ec2c59de9f3c3913579':
  Invalidate outline on padding update
 2015-01-27 01:37:09 +00:00
Alan Viverette
da9653a263 am 8648dfe5: am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 
* commit '8648dfe5f52f131b0af1a17a383ce11d213cedc2':
  Convert getHourForDegrees result to 12-hour format when needed
 2015-01-27 01:37:03 +00:00
Chris Craik
00c53d66dd am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
  Invalidate outline on padding update
 2015-01-27 01:13:00 +00:00
Alan Viverette
8648dfe5f5 am 5229be05: Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 
* commit '5229be05b439cf24b7028adbb64d05ecc23184ac':
  Convert getHourForDegrees result to 12-hour format when needed
 2015-01-27 01:12:56 +00:00
Chris Craik
cdd8b7f819 Merge "Invalidate outline on padding update" into lmp-mr1-dev 2015-01-27 01:08:54 +00:00
Alan Viverette
5229be05b4 Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev 2015-01-27 01:02:00 +00:00
Brian Attwell
7ba4751e91 Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2" 2015-01-27 00:50:01 +00:00
Brian Attwell
63f859b2b7 Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2 
Names are based on recent suggestions from the API council, such as
implemented inside ag/540453.

Bug: 18777272
Change-Id: I17a5b7cb4d4c5a0ba48936a6fc829acaab73f31d
 2015-01-27 00:05:07 +00:00
Alan Viverette
5efe0d199e Convert getHourForDegrees result to 12-hour format when needed 
Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.

Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
 2015-01-26 15:34:56 -08:00
Chris Craik
c43a820945 Invalidate outline on padding update 
bug:19113359

Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.

Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
 2015-01-26 14:40:29 -08:00
Lorenzo Colitti
cd4c8525fa am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
automerge: 583dec8

* commit '583dec84d95b69216b4f91dd31397dc5f32f4e95':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:24:23 +00:00
Lorenzo Colitti
583dec84d9 am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:22:27 +00:00
Lorenzo Colitti
3d992507a0 am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 
* commit '09dff843b8ed402564c4c89d7e1cabceb715e458':
  Only try to fetch time from NTP if there is a network connection.
 2015-01-26 22:16:03 +00:00
Lorenzo Colitti
09dff843b8 Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev 2015-01-26 22:08:19 +00:00
Alan Viverette
d5f35c2022 am a6b93909: am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'a6b9390949c4aa6f7de09fd0f44bb35ed7aabbc7':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:35:44 +00:00
Alan Viverette
a6b9390949 am e1eff7aa: am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'e1eff7aadeb0c9f6cc51f07166accd63710ea2c5':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:29:31 +00:00
Alan Viverette
e1eff7aade am de8d2840: Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev 
* commit 'de8d28405538128fad55e34dc7c74fd49a909ae6':
  Prevent drag-to-open from cycling pressed state, propagate hotspot
 2015-01-26 19:23:27 +00:00
Alan Viverette
2563095d2d Prevent drag-to-open from cycling pressed state, propagate hotspot 
Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
 2015-01-26 10:24:08 -08:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection. 
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
 2015-01-26 15:24:07 +09:00
Zhijun He
503e815a6f Camera2: add lens facing EXTERNAL enum 
This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
 2015-01-23 23:58:45 +00:00
Svetoslav
166aa68630 am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev automerge: 6e9f276 
automerge: 9027d73

* commit '9027d7355e8e804307902fb5ec88cf54e23cdcb4':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:38:30 +00:00
Svetoslav
9027d7355e am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
automerge: 6e9f276

* commit '6e9f276ff1554b59692a1820f60217307460308b':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1 am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4 Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 2015-01-23 22:22:18 +00:00
Brian Attwell
50f316051a Merge "Expose ContentProviderOperation type" 2015-01-23 21:33:57 +00:00
Brian Attwell
1cf7405f1f Expose ContentProviderOperation type 
CHANGE
isInsert, isDelete, isUpdate, isAssertQuery

JUSTIFICATION
The use of getType() in lots of unit tests means that
ContentProviderOperation#getType() can't practically be
removed.

Why not make it public? This allows 3p to use getType() in
unit tests. Plus it allows the unbundled contacts app
to continue using getType() in order to handle TYPE_INSERT
specially, without needing to awkwardly pass isInsert values
around.

Bug: 18777272
Change-Id: I6be5f325bbf6fbeb7817e9b1f7fa1a1ae2002e0b
 2015-01-23 13:32:39 -08:00
Andres Morales
9662bb703e Merge "check bootimage version string against system" 2015-01-23 20:54:13 +00:00
Andres Morales
7de24ce024 check bootimage version string against system 
vendor version string may be empty

Bug: 19058575
Change-Id: I99f38183187a44cd200c5ddf8d5ff45ef80199d8
 2015-01-23 12:49:40 -08:00
Chet Haase
34efbcedac am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev automerge: 458cc6a 
automerge: f647cde

* commit 'f647cde899c4462b465721cd705f234da7e82730':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:11:51 +00:00
Prerepa Viswanadham
543945669b am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
automerge: 34c32f4

* commit '34c32f4034f64306efde87a52e28f56c3e5c1d2a':
  Don't compute flags length for scan response
 2015-01-23 18:10:40 +00:00
Chet Haase
f647cde899 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
automerge: 458cc6a

* commit '458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:07:14 +00:00
Chet Haase
458cc6a515 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:04:03 +00:00
Prerepa Viswanadham
34c32f4034 am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
  Don't compute flags length for scan response
 2015-01-23 18:01:54 +00:00
Chet Haase
af8c621d21 Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963 am e77adabe: Don\'t compute flags length for scan response 
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
 2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf Don't compute flags length for scan response 
Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
 2015-01-23 17:51:43 +00:00
Lorenzo Colitti
98dd474f47 am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
automerge: 5c9546b

* commit '5c9546b1dabd36ad8358705ac617ea3c606d5317':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 13:05:26 +00:00
Lorenzo Colitti
5c9546b1da am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 13:01:42 +00:00
Lorenzo Colitti
50f9d93a1c am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a Support connecting to networks with misconfigured subnet masks. 
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
 2015-01-23 21:10:34 +09:00
Jinsuk Kim
f6483ac515 am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev automerge: 9ae7d49 
automerge: 55055d6

* commit '55055d690e77ab4547e2598d7da48e274b7adc67':
  CEC: Add logic to return to internal source
 2015-01-23 07:04:38 +00:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
 2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
 2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Lorenzo Colitti
e871f0176d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3 
automerge: 6840ffa

* commit '6840ffae6761b369992fceb6b880cd9cd600b136':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:10:48 +00:00
Lorenzo Colitti
6840ffae67 am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
automerge: fbaf6b3

* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:06:57 +00:00
Lorenzo Colitti
fbaf6b353d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:03:46 +00:00