Adam Powell
0fdf7c326a
Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp
...
am: 60c73947d0
2016-05-13 17:23:25 +00:00
Adam Powell
15021f66fa
Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706
...
am: a53d9cace1
2016-05-13 17:20:37 +00:00
Adam Powell
a53d9cace1
Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
...
am: e89dc40706
2016-05-13 17:17:44 +00:00
TreeHugger Robot
e89dc40706
Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
2016-05-13 17:11:14 +00:00
Adam Powell
86100d18ad
Show package icon/label for resolved package-targeted implicit intents
...
If we're going to show metadata about a resolved implicit intent that
is targeted to a single package with multiple potential targets,
populate the ResolveInfo with the label and icon of the target
package's ApplicationInfo and set resolvePackageName. This helps use
cases such as EXTRA_INITIAL_INTENTS in ChooserActivity, where
sometimes apps set target packages but not components.
Bug 28739056
Change-Id: I8070d341fccc139463c5ac8d66db45fce02252e5
2016-05-13 08:34:37 -07:00
Steven Ng
335e4bdf60
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev am: e333b2eb81
...
am: a62fc512da
2016-05-13 11:38:43 +00:00
Steven Ng
a62fc512da
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
...
am: e333b2eb81
2016-05-13 11:36:20 +00:00
Steven Ng
e333b2eb81
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
2016-05-13 11:27:59 +00:00
Andrii Kulian
42a2e42f94
Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a am: 1c4c2caa4c
...
am: 49f7135fef
2016-05-13 03:35:42 +00:00
Andrii Kulian
49f7135fef
Merge "Close leaked windows when trying to preserve main one" into nyc-dev am: 4ef107bb7a
...
am: 1c4c2caa4c
2016-05-13 03:33:12 +00:00
Andrii Kulian
1c4c2caa4c
Merge "Close leaked windows when trying to preserve main one" into nyc-dev
...
am: 4ef107bb7a
2016-05-13 03:30:45 +00:00
Andrii Kulian
48164fd554
Merge "Close leaked windows when trying to preserve main one" into nyc-dev
...
am: 4ef107bb7a
2016-05-13 03:30:41 +00:00
Andrii Kulian
4ef107bb7a
Merge "Close leaked windows when trying to preserve main one" into nyc-dev
2016-05-13 03:24:34 +00:00
Vladislav Kaznacheev
89126c6a1f
Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3 am: a072db029f
...
am: 7f163a39a3
2016-05-13 01:31:30 +00:00
Vladislav Kaznacheev
7f163a39a3
Merge "Partial fix for jumping freeform windows" into nyc-dev am: d5c94d1af3
...
am: a072db029f
2016-05-13 01:28:45 +00:00
Vladislav Kaznacheev
a072db029f
Merge "Partial fix for jumping freeform windows" into nyc-dev
...
am: d5c94d1af3
2016-05-13 01:26:01 +00:00
Vladislav Kaznacheev
9e13b1f218
Merge "Partial fix for jumping freeform windows" into nyc-dev
...
am: d5c94d1af3
2016-05-13 01:25:52 +00:00
TreeHugger Robot
d5c94d1af3
Merge "Partial fix for jumping freeform windows" into nyc-dev
2016-05-13 01:21:12 +00:00
Steve Pomeroy
4c8c470015
Merge "ContentValues: improve documentation" into nyc-dev
...
am: 33d0ff9959
2016-05-13 01:17:57 +00:00
Steve Pomeroy
115f43cda7
Merge "Fix documentation bug in SQLiteDatabase" into nyc-dev
...
am: d07a3c4203
2016-05-13 01:17:54 +00:00
TreeHugger Robot
33d0ff9959
Merge "ContentValues: improve documentation" into nyc-dev
2016-05-13 01:12:52 +00:00
Vladislav Kaznacheev
cb4bbd7af8
Partial fix for jumping freeform windows
...
Currently every focus change causes a freeform window to jump
for a few frames. The size of the jump is equal to the difference
in inset size (which is derived directly from the window elevation).
This problem goes away for most real use cases if the insets are
not allowed to decrease.
Bug: 28318973
Bug: 22668382
Change-Id: I77ca440a7d9c89cc4d45e6667bf37da94a5c8a9a
2016-05-12 23:56:32 +00:00
Steve Pomeroy
c240b607f7
Fix documentation bug in SQLiteDatabase
...
The documentation incorrectly states that, "[insertWithOnConflict
returns] the primary key of the existing row if the input param
'conflictAlgorithm' = CONFLICT_IGNORE". Unfortunately, SQLite does
not provide such functionality.
Close: https://code.google.com/p/android/issues/detail?id=13045
Signed-off-by: Steve Pomeroy <steve@staticfree.info >
(cherry picked from commit 8fc3144fa5
2016-05-12 16:53:10 -07:00
Steve Pomeroy
b31b1cc5ff
ContentValues: improve documentation
...
Correct and clarify the documentation for ContentValues.
Signed-off-by: Steve Pomeroy <steve@staticfree.info >
(cherry picked from commit 1276b5f29e
2016-05-12 16:51:52 -07:00
TreeHugger Robot
84129e3251
Merge "Minor optimizations"
2016-05-12 23:37:56 +00:00
Yigit Boyar
310128df9f
Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2 am: 16b53c67c1
...
am: 734ca44a24
2016-05-12 23:33:01 +00:00
Yigit Boyar
734ca44a24
Merge "Respect add focusables flags" into nyc-dev am: 4c6eeb67a2
...
am: 16b53c67c1
2016-05-12 23:29:53 +00:00
Yigit Boyar
16b53c67c1
Merge "Respect add focusables flags" into nyc-dev
...
am: 4c6eeb67a2
2016-05-12 23:27:19 +00:00
Yigit Boyar
bd6f5fc3a0
Merge "Respect add focusables flags" into nyc-dev
...
am: 4c6eeb67a2
2016-05-12 23:27:19 +00:00
Yigit Boyar
4c6eeb67a2
Merge "Respect add focusables flags" into nyc-dev
2016-05-12 23:19:22 +00:00
Steve Pomeroy
061186d72a
Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db am: 88968cc3ba
...
am: 54bb5dbd65
2016-05-12 22:36:27 +00:00
Steve Pomeroy
54bb5dbd65
Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e am: b654fae4db
...
am: 88968cc3ba
2016-05-12 22:34:02 +00:00
Steve Pomeroy
88968cc3ba
Merge "Fix documentation bug in SQLiteDatabase" am: 21d061ec2e
...
am: b654fae4db
2016-05-12 22:31:52 +00:00
Steve Pomeroy
3f0fcdb1f6
Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 am: b6c826227d
...
am: d88ca0e659
2016-05-12 22:31:49 +00:00
Steve Pomeroy
d88ca0e659
Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
...
am: b6c826227d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b654fae4db
Merge "Fix documentation bug in SQLiteDatabase"
...
am: 21d061ec2e
2016-05-12 22:29:22 +00:00
Steve Pomeroy
b6c826227d
Merge "ContentValues: improve documentation" am: b44d4207c1
...
am: 78e5a04902
2016-05-12 22:27:12 +00:00
Treehugger Robot
21d061ec2e
Merge "Fix documentation bug in SQLiteDatabase"
2016-05-12 22:25:20 +00:00
Steve Pomeroy
78e5a04902
Merge "ContentValues: improve documentation"
...
am: b44d4207c1
2016-05-12 22:24:41 +00:00
Yigit Boyar
4c6e983000
Respect add focusables flags
...
This CL fixes 2 bugs in View's addFocusables implementations.
1) addFocusables(list, dir) method was always returning focusables in
touch mode even if the device is not in touch mode.
2) addFocusables(list, dir, mode) was not respecting the provided mod.
Bug: 28745577
Change-Id: I9b9e5af27f8f5b1bb3cc601584fdad7c73e54a5d
2016-05-12 15:11:13 -07:00
Philip Cuadra
396da016ed
Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 5fcabe19a7
...
am: d49592805f
2016-05-12 22:10:26 +00:00
John Reck
41f864ec45
Minor optimizations
...
Don't save matrix if we just need clip saved
Early-reject the easy-to-reject cases in Canvas
before hitting JNI
Change-Id: I385ef90a31efbda31ce37837152f626aad553ee7
2016-05-12 15:07:49 -07:00
Philip Cuadra
d49592805f
Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df
...
am: 5fcabe19a7
2016-05-12 22:07:43 +00:00
Philip Cuadra
5fcabe19a7
Merge "Pinner service for pinning files into memory" into nyc-dev
...
am: b41088b4df
2016-05-12 22:04:36 +00:00
Philip Cuadra
0513394f85
Merge "Pinner service for pinning files into memory" into nyc-dev
...
am: b41088b4df
2016-05-12 22:04:26 +00:00
Philip Cuadra
b41088b4df
Merge "Pinner service for pinning files into memory" into nyc-dev
2016-05-12 21:55:29 +00:00
Dimitry Ivanov
e543776d59
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b am: 76766d29b3
...
am: 61820a6a63
2016-05-12 21:26:16 +00:00
Jesse Hall
61820a6a63
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev am: 7f0708390b
...
am: 76766d29b3
2016-05-12 21:23:51 +00:00
Dimitry Ivanov
76766d29b3
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
...
am: 7f0708390b
2016-05-12 21:21:25 +00:00
Dimitry Ivanov
69efd6c0c2
Merge "Move Vulkan layer path setup to ApplicationLoaders" into nyc-dev
...
am: 7f0708390b
2016-05-12 21:21:23 +00:00
