Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,058 Commits 3 Branches 0 Tags
1e4e9850cf0d9bbf52ebdda1c3de4ea00a1f2bcf
Commit Graph

235058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
1e4e9850cf Add CREATOR class to Selection. am: 2fbb40eebd 
am: 7b814c76bf

* commit '7b814c76bf32050ac10708122e6a93514a2773be':
  Add CREATOR class to Selection.
 2016-02-22 21:27:31 +00:00
Shawn Willden
1ab6e33f23 Merge "Add option to allow key validity after fingerprint enrollment." into nyc-dev am: 272fe13331 
am: 718dce52eb

* commit '718dce52eb1a32fcc0d366f2244267e6a7cb35f2':
  Add option to allow key validity after fingerprint enrollment.
 2016-02-22 21:26:20 +00:00
Steve McKay
6eb2b937b0 Merge "Move directory and roots support to own ui bots." into nyc-dev am: cddd034ca7 
am: 45602c0251

* commit '45602c025185565d039b96984bef214c74a3cdd3':
  Move directory and roots support to own ui bots.
 2016-02-22 21:25:12 +00:00
Adam Lesinski
9f8e71a2c7 Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours am: ab4d629294 -s ours am: 202fbf2c34 -s ours am: 43c452eea8 -s ours 
am: 45104c92da  -s ours

* commit '45104c92dab69842a25044235b9fbd72245b1650':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.
 2016-02-22 21:23:50 +00:00
Adam Lesinski
d1b346bcae Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8 -s ours am: 83fd156e21 -s ours am: 5c918ee029 -s ours am: 209d706d2b -s ours 
am: a7194069bd  -s ours

* commit 'a7194069bddb1b38a1d6f19696772c52c9b6b440':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
 2016-02-22 21:22:40 +00:00
Keisuke Kuroyanagi
04755fcae4 Merge "Make drag shadow grapheme cluster aware." into nyc-dev am: f2629d481e 
am: e4ba22e7d6

* commit 'e4ba22e7d67bae08c67a9221bc3e98bdf7a0d0d3':
  Make drag shadow grapheme cluster aware.
 2016-02-22 21:21:22 +00:00
Toni Barzic
95642d59e9 Properly handle non split system user when showing bouncer am: b799d3f127 
am: 8508ed5044

* commit '8508ed5044e993d0e0e2ba875bc90c819ad93c03':
  Properly handle non split system user when showing bouncer
 2016-02-22 21:20:05 +00:00
Toni Barzic
49f36aba1c Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev am: a2ab1d6932 
am: 53ff8e5573  -s ours

* commit '53ff8e5573a0fd04deaf943c38aea2cb3b2e1d38':
  Try to dismiss Keyguard bypassing bouncer only for active users
 2016-02-22 21:17:28 +00:00
Tao Bao
69d01e2376 Merge "Add support for update-on-boot feature." into nyc-dev am: 9de7952aa9 
am: 3dd23af6a0

* commit '3dd23af6a0fb58ce7d1f6f078c765890ca839bd3':
  Add support for update-on-boot feature.
 2016-02-22 21:10:21 +00:00
Youngsang Cho
3d1265bda7 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev am: ffd4c73a29 
am: ad5dccf123

* commit 'ad5dccf123d20ad56c40641fe71a49e322db90f6':
  PIP: Rename closeInternal to closePipInternal
 2016-02-22 21:08:54 +00:00
Steve McKay
7b814c76bf Add CREATOR class to Selection. 
am: 2fbb40eebd

* commit '2fbb40eebd508b67e53f5a8590caf57a53cfb25d':
  Add CREATOR class to Selection.
 2016-02-22 20:36:40 +00:00
Steve McKay
2fbb40eebd Add CREATOR class to Selection. 
Bug: 27236334
Change-Id: I5f50cd63b850785194fec2db3eb68e40aa7af34f
 2016-02-22 12:29:37 -08:00
Shawn Willden
718dce52eb Merge "Add option to allow key validity after fingerprint enrollment." into nyc-dev 
am: 272fe13331

* commit '272fe13331cad7197e47c19056d2f49dd26ba0b3':
  Add option to allow key validity after fingerprint enrollment.
 2016-02-22 20:23:50 +00:00
Steve McKay
45602c0251 Merge "Move directory and roots support to own ui bots." into nyc-dev 
am: cddd034ca7

* commit 'cddd034ca78fd92be132cb2336eb2bff04ac5ce8':
  Move directory and roots support to own ui bots.
 2016-02-22 20:20:02 +00:00
Adam Lesinski
45104c92da Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours am: ab4d629294 -s ours am: 202fbf2c34 -s ours 
am: 43c452eea8  -s ours

* commit '43c452eea8cf60fd2319aa43257783ab4bf7f515':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.
 2016-02-22 20:18:53 +00:00
Adam Lesinski
a7194069bd Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8 -s ours am: 83fd156e21 -s ours am: 5c918ee029 -s ours 
am: 209d706d2b  -s ours

* commit '209d706d2b5965d189a532edc0e70f75be4e0141':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
 2016-02-22 20:17:05 +00:00
Keisuke Kuroyanagi
e4ba22e7d6 Merge "Make drag shadow grapheme cluster aware." into nyc-dev 
am: f2629d481e

* commit 'f2629d481e19e43235ea4546ab53443fbd432988':
  Make drag shadow grapheme cluster aware.
 2016-02-22 20:15:52 +00:00
Toni Barzic
8508ed5044 Properly handle non split system user when showing bouncer 
am: b799d3f127

* commit 'b799d3f127f7410e8d0afe16343032e6115750fc':
  Properly handle non split system user when showing bouncer
 2016-02-22 20:14:04 +00:00
Shawn Willden
272fe13331 Merge "Add option to allow key validity after fingerprint enrollment." into nyc-dev 2016-02-22 20:12:42 +00:00
Toni Barzic
53ff8e5573 Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev 
am: a2ab1d6932

* commit 'a2ab1d6932a7135fc1696fcc8a623fc26eef0c18':
  Try to dismiss Keyguard bypassing bouncer only for active users
 2016-02-22 20:11:51 +00:00
Tao Bao
3dd23af6a0 Merge "Add support for update-on-boot feature." into nyc-dev 
am: 9de7952aa9

* commit '9de7952aa945eb06148f82b9f30d7d11a2de5d74':
  Add support for update-on-boot feature.
 2016-02-22 20:09:58 +00:00
Youngsang Cho
ad5dccf123 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev 
am: ffd4c73a29

* commit 'ffd4c73a293ebac22efa644db99ba907f9776604':
  PIP: Rename closeInternal to closePipInternal
 2016-02-22 20:07:47 +00:00
Steve McKay
cddd034ca7 Merge "Move directory and roots support to own ui bots." into nyc-dev 2016-02-22 20:01:48 +00:00
Felipe Leme
6091b74748 Merge "Removed bugreport intents from protected list." into nyc-dev am: ab9a9b09fd 
am: b492dcb0e7

* commit 'b492dcb0e749940d8d5fc3783c29d89b1b5fa9ff':
  Removed bugreport intents from protected list.
 2016-02-22 20:01:40 +00:00
Chad Brubaker
1d8181b032 Merge "Use provided context directly" into nyc-dev am: 62df07eee1 
am: d7d383875c

* commit 'd7d383875c2f24e693bf21570a8e3d7043f08689':
  Use provided context directly
 2016-02-22 19:59:48 +00:00
Adam Lesinski
43c452eea8 Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours am: ab4d629294 -s ours 
am: 202fbf2c34  -s ours

* commit '202fbf2c34cee4d3b66fd26dec7f49259ef638b5':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.
 2016-02-22 19:56:20 +00:00
Adam Lesinski
209d706d2b Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8 -s ours am: 83fd156e21 -s ours 
am: 5c918ee029  -s ours

* commit '5c918ee029276efe090e82086fd4089d7686e60f':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
 2016-02-22 19:53:54 +00:00
Youngsang Cho
8730d4a9f8 Merge "Close PIP when PIP activity is finished" into nyc-dev am: d78bf970ca 
am: ab4848ccf5

* commit 'ab4848ccf5074709ba41ea1da3c69ee9d83a9266':
  Close PIP when PIP activity is finished
 2016-02-22 19:51:49 +00:00
Steve McKay
b9a20d10c9 Move directory and roots support to own ui bots. 
Also...sorry, snowball, don't automatically open folders
    that are created in Files app. Only do this in DocumentsActivity.

Change-Id: I271655fd3566496eced4aaa7a44d5110233150a0
 2016-02-22 11:50:34 -08:00
Felipe Leme
a77007a427 Merge "Improved OpenExternalDirectoryActivity so it returns right away when an app already has the requested permission." into nyc-dev am: c657f3d0ba 
am: 305940d5cc

* commit '305940d5cc201043e0d8baf71a6a15a34a4fa6c8':
  Improved OpenExternalDirectoryActivity so it returns right away when an app already has the requested permission.
 2016-02-22 19:50:12 +00:00
Mady Mellor
1bae382eae Merge "Fix crash when clearing all notifications" into nyc-dev am: e03688068f 
am: 70a43269b3

* commit '70a43269b30f6e0ce8ec92ab99d63ef46a4d5a02':
  Fix crash when clearing all notifications
 2016-02-22 19:48:47 +00:00
Felipe Leme
b492dcb0e7 Merge "Removed bugreport intents from protected list." into nyc-dev 
am: ab9a9b09fd

* commit 'ab9a9b09fdd9b8c9f666149f9840a09a97b91885':
  Removed bugreport intents from protected list.
 2016-02-22 19:47:40 +00:00
Chad Brubaker
d7d383875c Merge "Use provided context directly" into nyc-dev 
am: 62df07eee1

* commit '62df07eee1c8b186362f6542daf900c88193929d':
  Use provided context directly
 2016-02-22 19:44:42 +00:00
Adam Lesinski
202fbf2c34 Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687 -s ours 
am: ab4d629294  -s ours

* commit 'ab4d62929412556b90f8927fb05602d2e630518c':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.
 2016-02-22 19:44:19 +00:00
Adam Lesinski
5c918ee029 Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8 -s ours 
am: 83fd156e21  -s ours

* commit '83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
 2016-02-22 19:42:04 +00:00
Youngsang Cho
ab4848ccf5 Merge "Close PIP when PIP activity is finished" into nyc-dev 
am: d78bf970ca

* commit 'd78bf970ca8b7a48bf26651016c034b5e319456c':
  Close PIP when PIP activity is finished
 2016-02-22 19:40:29 +00:00
Keisuke Kuroyanagi
f2629d481e Merge "Make drag shadow grapheme cluster aware." into nyc-dev 2016-02-22 19:40:13 +00:00
Felipe Leme
305940d5cc Merge "Improved OpenExternalDirectoryActivity so it returns right away when an app already has the requested permission." into nyc-dev 
am: c657f3d0ba

* commit 'c657f3d0ba1f192c9819ffa79903588b605ef470':
  Improved OpenExternalDirectoryActivity so it returns right away when an app already has the requested permission.
 2016-02-22 19:39:00 +00:00
Keisuke Kuroyanagi
5396d7eb13 Make drag shadow grapheme cluster aware. 
[start, min(end, DRAG_SHADOW_MAX_TEXT_LENGTH)) was used to make drag
shadow. It ignores grapheme cluster, so unexpected shadow was created for
characters that contain multiple code units.

Bug: 23097276
Change-Id: Ic7d34ec02ea04a3f17337e4253babac87ef3b03c
 2016-02-22 19:37:26 +00:00
Mady Mellor
70a43269b3 Merge "Fix crash when clearing all notifications" into nyc-dev 
am: e03688068f

* commit 'e03688068f320d0401ba2dc5e10c85fc6d2affaa':
  Fix crash when clearing all notifications
 2016-02-22 19:36:40 +00:00
Toni Barzic
b799d3f127 Properly handle non split system user when showing bouncer 
For system user, there should be no atempt to dismiss keyguard,
but only if system user is split (i.e. not a meat user).

Change-Id: Ia2c1e7a3e197c5be72446f21b3883e853485ff26
(cherry picked from commit aa401afb4c)
 2016-02-22 19:32:15 +00:00
Toni Barzic
a2ab1d6932 Merge "Try to dismiss Keyguard bypassing bouncer only for active users" into nyc-dev 2016-02-22 19:31:52 +00:00
Adam Lesinski
ab4d629294 Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev 
am: d201f48687  -s ours

* commit 'd201f486871e825e713ae0df2f2f01e3dfff94d8':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.
 2016-02-22 19:31:32 +00:00
Adam Lesinski
83fd156e21 Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev 
am: 3e439db8c8  -s ours

* commit '3e439db8c829023645a54eee4cd531928bccb03d':
  DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
 2016-02-22 19:27:18 +00:00
Tao Bao
9de7952aa9 Merge "Add support for update-on-boot feature." into nyc-dev 2016-02-22 19:24:25 +00:00
Youngsang Cho
ffd4c73a29 Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev 2016-02-22 19:22:32 +00:00
Youngsang Cho
336007ba71 PIP: Rename closeInternal to closePipInternal 
Change-Id: I6e1e98a1a75728d057a7dee3edbd2f2a6f32112d
 2016-02-22 11:17:29 -08:00
Felipe Leme
ab9a9b09fd Merge "Removed bugreport intents from protected list." into nyc-dev 2016-02-22 19:17:08 +00:00
Chad Brubaker
62df07eee1 Merge "Use provided context directly" into nyc-dev 2016-02-22 19:11:51 +00:00
Chad Brubaker
7879b8f4ab Use provided context directly 
getApplicationContext may return null so use the provided context
instead.

Bug:27293859
Change-Id: Ic3b218bf5b0c23982c75a793f0374870bd8e9da1
 2016-02-22 11:08:59 -08:00