drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,833 Commits 1 Branch 0 Tags
Commit Graph

180833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
bd1c42dc31 Import translations. DO NOT MERGE 
Change-Id: I11abe22731fb5eb346f924cba7b21ac6b9a5be13
Auto-generated-cl: translation import
 2015-01-26 07:34:55 -08:00
Alexandra Gherghina
f11bf431f9 am 2f1964a9: am 1a4802b9: am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit '2f1964a9330ee9d25d0bf90e01dc34a1ceaf2ce4':
  Update badge assets
 2015-01-26 12:17:55 +00:00
Alexandra Gherghina
2f1964a933 am 1a4802b9: am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit '1a4802b9312886c0323958e1c1008de16d5f18c7':
  Update badge assets
 2015-01-26 12:11:09 +00:00
Alexandra Gherghina
1a4802b931 am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit 'abaf69dd195aa55c151ab16730e9511539ed46e5':
  Update badge assets
 2015-01-26 12:05:36 +00:00
Alexandra Gherghina
abaf69dd19 Merge "Update badge assets" into lmp-mr1-dev 2015-01-26 11:59:22 +00:00
Benjamin Franz
8e1b6d949b am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev automerge: 2805669 
* commit 'ad66480838189332b82cd2861bca4357aa2b93da':
  Avoid NullPointerException if createUser returns null
 2015-01-26 11:04:41 +00:00
Benjamin Franz
ad66480838 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
automerge: 2805669

* commit '2805669954b70b918d7b24f6695c4da85d6f88e8':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:59:45 +00:00
Benjamin Franz
2805669954 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:55:14 +00:00
Zoltan Szatmary-Ban
43daa008f3 am 20bd0c23: am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '20bd0c232cd4421affc871ccd01492ecd04316d0':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:54:55 +00:00
Zoltan Szatmary-Ban
20bd0c232c am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:49:53 +00:00
Benjamin Franz
6d16b8614a Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 2015-01-26 10:49:48 +00:00
Zoltan Szatmary-Ban
059b8ab6a9 am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '414ea81ea364d7b961cbfb885c30729595e3a7b2':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:41:00 +00:00
Alexandra Gherghina
b5d34f3b6a Update badge assets 
Bug: 18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007
 2015-01-26 10:40:34 +00:00
Zoltan Szatmary-Ban
414ea81ea3 Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 2015-01-26 10:36:14 +00:00
Elliott Hughes
c4be6461b3 am f51d65ad: Merge "Add missing <string.h> includes." automerge: 82a1a2c automerge: 86b48b3 
* commit 'f51d65ade0112c3d50c3d9182f583730a597322b':
  Add missing <string.h> includes.
 2015-01-25 20:53:33 +00:00
Elliott Hughes
f51d65ade0 Merge "Add missing <string.h> includes." automerge: 82a1a2c 
automerge: 86b48b3

* commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464':
  Add missing <string.h> includes.
 2015-01-25 19:27:25 +00:00
Elliott Hughes
86b48b3f80 Merge "Add missing <string.h> includes." 
automerge: 82a1a2c

* commit '82a1a2c63959adc0c7e3208c6ffa6985a346ae57':
  Add missing <string.h> includes.
 2015-01-25 19:21:31 +00:00
Elliott Hughes
82a1a2c639 Merge "Add missing <string.h> includes." 2015-01-25 19:17:42 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes. 
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
 2015-01-25 08:33:36 -08:00
Zhijun He
efa1534817 camera2: update API txt for the API change 
Change-Id: I4a9476849f5fde9dff669876bbdaf055bd3adc48
 2015-01-23 17:30:31 -08:00
Sanket Padawe
fd138347bd am b0b28059: Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev automerge: c309688 
automerge: 5d4d8d6

* commit '5d4d8d68fcc5a7a18effcf12e8f032c434eb469b':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:19:10 +00:00
Sanket Padawe
5d4d8d68fc am b0b28059: Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev automerge: c309688 
* commit 'b0b28059b00fa17899e22b0a75310c9348186223':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:06:34 +00:00
Sanket Padawe
b0b28059b0 Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 
automerge: c309688

* commit 'c309688bfaf204c892635783aad96443a41fdffb':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:00:58 +00: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
Sanket Padawe
c309688bfa Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 2015-01-23 23:54:47 +00:00
Svetoslav
8a1d65b76a Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e automerge: db1983b 
automerge: cd2ed4e

* commit 'cd2ed4e64c501a5dbf73941a4a1f1e4bc639ebf3':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:35:42 +00:00
Svetoslav
cd2ed4e64c Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:31:38 +00:00
Svetoslav
db1983b3f4 Accessibility: Sometimes cannot interact with nav bar items. 
automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:27:34 +00:00
Svetoslav
10a053e474 Accessibility: Sometimes cannot interact with nav bar items. 
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
 2015-01-23 15:05:20 -08: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
Jinsuk Kim
b63524cc67 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev automerge: ca1384d 
automerge: f612132

* commit 'f612132003d787a2b0e6af35d7a6e291d1cb186c':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:24:47 +00:00
Jinsuk Kim
f612132003 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
automerge: ca1384d

* commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:20:46 +00:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00: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
John Reck
fe026218d0 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev automerge: bb8d7ff 
automerge: 1e5dd46

* commit '1e5dd46133bd47445ba0657692fb86492acad705':
  Prevent memory corruption from use-after-free
 2015-01-23 20:37:27 +00:00
John Reck
1e5dd46133 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free
 2015-01-23 20:33:18 +00:00
John Reck
bb8d7ffeae am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
* commit '94474515e035d726ff24c48233c452ce34ef7c01':
  Prevent memory corruption from use-after-free
 2015-01-23 20:29:10 +00:00
John Reck
94474515e0 Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 2015-01-23 20:24:57 +00:00
Miao Wang
6ea8ca8206 am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev automerge: 1446eb8 
automerge: 2fd1a8b

* commit '2fd1a8b6ca93a99c083a3269ae69ae7d67701a8b':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:41:02 +00:00
Miao Wang
2fd1a8b6ca am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
automerge: 1446eb8

* commit '1446eb8f6130e4833ca2b74331b867d30445aca3':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:34:48 +00:00
Winson Chung
fcb6148367 Merge "Adding dismiss-all button." 2015-01-23 19:23:44 +00:00
Miao Wang
1446eb8f61 am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
* commit '2772ee6d8144bde55464592bb74ad35176425ea7':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:22:48 +00:00
Miao Wang
2772ee6d81 Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 2015-01-23 19:17:13 +00:00