Jeff Sharkey
e78e7ff560
Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev am: 4afe32d
...
am: baa9a1a
2016-03-31 03:53:11 +00:00
Jeff Sharkey
baa9a1a5d5
Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev
...
am: 4afe32d
2016-03-31 03:50:25 +00:00
Jeff Sharkey
4afe32d493
Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev
2016-03-31 03:46:14 +00:00
Sudheer Shanka
994651ff69
Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev am: d2a968f
...
am: 81c6380
2016-03-31 02:23:05 +00:00
Andrii Kulian
e61d037a87
Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev am: ac94586
...
am: b6ba05f
2016-03-31 02:22:57 +00:00
Sudheer Shanka
81c6380114
Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev
...
am: d2a968f
2016-03-31 02:17:16 +00:00
Andrii Kulian
b6ba05ffb0
Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev
...
am: ac94586
* commit 'ac945867145c571506a211ccb0a87a3402c4d745':
Refactor usages of Picture In Picture and Multi Window (1/4)
Change-Id: I34a274c3eca15546d7be85fbb30ac072ff03db7f
2016-03-31 02:17:08 +00:00
Jeff Sharkey
281c182cb8
Keep COLUMN_LOCAL_URI working for now.
...
Bug: 26515039
Change-Id: I48f3ef90443b01fb75a3852e5cfdd83a9bbcac0f
2016-03-30 19:46:42 -06:00
Sudheer Shanka
d2a968f9c3
Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev
2016-03-31 01:14:21 +00:00
Andrii Kulian
ac94586714
Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev
2016-03-31 00:57:42 +00:00
Sudheer Shanka
549b969280
Return null value if getActiveAdminUncheckedLocked returns null.
...
- Split per user version of getUserRestrictions into a separate method
in DPMS and make the per-user version return null if the admin
parameter is not a valid one.
- Update isAccessibilityServicePermittedByAdmin and
isInputMethodPermittedByAdmin to return false if the admin parameter
is not a valid one.
Bug: 27909087
Change-Id: I6f4cae6552cbfe02dc4a92b04eeeddf0314e0974
2016-03-30 17:12:07 -07:00
Lorenzo Colitti
f545e52e95
Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev am: 7d4ed2f
...
am: 882f62d
2016-03-30 23:12:11 +00:00
Lorenzo Colitti
882f62dd1a
Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev
...
am: 7d4ed2f
2016-03-30 23:09:25 +00:00
Lorenzo Colitti
7d4ed2f5ab
Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev
2016-03-30 23:03:18 +00:00
Adam Lesinski
bbc56794e4
Merge "Allow multiple Resources associated with an Activity" into nyc-dev am: d17f96a
...
am: 7baa521
2016-03-30 22:39:54 +00:00
Adam Lesinski
7baa5212c2
Merge "Allow multiple Resources associated with an Activity" into nyc-dev
...
am: d17f96a
2016-03-30 22:37:35 +00:00
Adam Lesinski
7f3f499887
Allow multiple Resources associated with an Activity
...
Previously it was assumed that one Resources object per Activity would be fine.
This proved to be incorrect, as methods like Context#createConfigurationContext()
expect to create a new Resources object that gets updated whenever the Activity Resources
get updated.
To fix this issue, there exists a master override configuration for each Activity. Subsequent
Resources created for an Activity will be based off that master override configuration, and
will be updated accordingly.
Bug:27644297
Bug:27604953
Change-Id: Idb3d851f55ee7981eec4e3fe28e2ea8d55f1192d
2016-03-30 14:27:11 -07:00
Seigo Nonaka
969b3c4f11
Merge "Fix incorrect initial locale negotiation." into nyc-dev am: 48d8a39
...
am: 0ab71b6
2016-03-30 19:58:32 +00:00
Seigo Nonaka
0ab71b606d
Merge "Fix incorrect initial locale negotiation." into nyc-dev
...
am: 48d8a39
2016-03-30 19:54:21 +00:00
Roozbeh Pournader
48d8a39b71
Merge "Fix incorrect initial locale negotiation." into nyc-dev
2016-03-30 19:44:25 +00:00
Rubin Xu
29f23aaf2e
Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev am: 5b7ca24
...
am: 4b86800
2016-03-30 18:02:08 +00:00
Rubin Xu
4b86800055
Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev
...
am: 5b7ca24
2016-03-30 17:57:50 +00:00
Rubin Xu
5b7ca24f14
Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev
2016-03-30 17:46:18 +00:00
Clara Bayarri
cc536fd307
Merge "Change default work challenge background color" into nyc-dev am: 30fb053
...
am: 3fcd1e7
2016-03-30 16:32:13 +00:00
Clara Bayarri
3fcd1e74f4
Merge "Change default work challenge background color" into nyc-dev
...
am: 30fb053
2016-03-30 16:24:03 +00:00
Andrei Stingaceanu
bbb3aee63a
Merge "AfW custom lock screen message - API polish" into nyc-dev am: b70ba19
...
am: f46e776
* commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874':
AfW custom lock screen message - API polish
Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184
2016-03-30 16:15:39 +00:00
Clara Bayarri
30fb053449
Merge "Change default work challenge background color" into nyc-dev
2016-03-30 16:13:00 +00:00
Clara Bayarri
8d0bd7fa63
Change default work challenge background color
...
Requested by UX
Bug: 27829562
Change-Id: I815c06784189e68b09e464e936521e82091c93c3
2016-03-30 17:12:08 +01:00
Seigo Nonaka
c14dd78a2c
Fix incorrect initial locale negotiation.
...
It turned out that calling ResourceManager.setDefaultLocalesLocked
and ResourcesManager.applyConfigurationToResourcesLocked
can be called before the locale negotiation is ready.
To fix this issue, move ResourcesManager setup flow after creating
application context.
This also introduces RuntimeException for notifying developers the
initialize order.
Bug: 27567902
Change-Id: Iab7ea384b039fb649fb52d06d45b2bfae21f9a8a
2016-03-31 00:21:35 +09:00
Andrei Stingaceanu
f46e776b06
Merge "AfW custom lock screen message - API polish" into nyc-dev
...
am: b70ba19
2016-03-30 12:35:38 +00:00
Andrei Stingaceanu
b70ba1971c
Merge "AfW custom lock screen message - API polish" into nyc-dev
2016-03-30 12:23:56 +00:00
Rubin Xu
b436591708
Add DevicePolicyManager API to install a client cert chain.
...
When installing a keypair the caller will have the option to specify a
certificate chain which will later be returned to whoever requests access
to the keypair via KeyChain.
Bug: 18239590
Change-Id: Id21ef026e31537db38d891cb9b712dd4fe7159c7
2016-03-30 11:57:58 +01:00
Andrii Kulian
933076d805
Refactor usages of Picture In Picture and Multi Window (1/4)
...
Bug: 27365860
Change-Id: I1590e430a12ceb84cb83da295e0bf7e4378fea96
2016-03-29 18:39:45 -07:00
George Mount
5f938362fc
Merge "Ensure window has been added in isTopOfTask" into nyc-dev am: e6ef0f9
...
am: 5659056
2016-03-29 20:10:20 +00:00
George Mount
5659056da7
Merge "Ensure window has been added in isTopOfTask" into nyc-dev
...
am: e6ef0f9
2016-03-29 20:07:21 +00:00
George Mount
d0ca0e0984
Ensure window has been added in isTopOfTask
...
Bug 27893230
When isTopOfTask is called prior to the window being added, it
will throw an IllegalArgumentException. This checks that the
window has been added before making the call.
Change-Id: Idd14c0f1051e16d96a0a1fa9f990f380a1f69911
2016-03-29 10:35:03 -07:00
Andrei Stingaceanu
16187903b4
AfW custom lock screen message - API polish
...
DevicePolicyManager:
* getDeviceOwnerLockScreenInfo now returns CharSequence as it returns a string
for display to a user
* setDeviceOwnerLockScreenInfo
** accepts CharSequence, not String as this is a string displayed to the user
** Returns void; throws an appropriate runtime exception on failure
Bug: 27531295
Change-Id: I30528569cfa66ee76f857fbee1c3196f821718fd
2016-03-29 13:04:29 +00:00
Joe Onorato
df1f2c5205
Merge "Refactor ProcessStats." into nyc-dev am: 0caf007
...
am: ee93672
2016-03-28 21:17:56 +00:00
Wale Ogunwale
f33eb79eb5
Merge "Show non-top tasks in the docked stack in recents." into nyc-dev am: ddfc6f7
...
am: ff064a4
2016-03-28 21:17:51 +00:00
Joe Onorato
ee93672b78
Merge "Refactor ProcessStats." into nyc-dev
...
am: 0caf007
2016-03-28 21:06:08 +00:00
Wale Ogunwale
ff064a4679
Merge "Show non-top tasks in the docked stack in recents." into nyc-dev
...
am: ddfc6f7
2016-03-28 21:06:04 +00:00
Joe Onorato
0caf007b3f
Merge "Refactor ProcessStats." into nyc-dev
2016-03-28 20:52:39 +00:00
Wale Ogunwale
ddfc6f7dc9
Merge "Show non-top tasks in the docked stack in recents." into nyc-dev
2016-03-28 20:22:35 +00:00
Wale Ogunwale
64ae08aa16
Show non-top tasks in the docked stack in recents.
...
Allows the user to access the task through recents since
it isn't currently visible on screen.
Also, changed recents to launch task currently in the docked
stack in the fullscreen stack when selected from recents list.
Bug: 27864383
Change-Id: I58549023920d064a30b6355367c3193ce3207bbd
2016-03-28 12:06:44 -07:00
George Mount
d1fe045611
Merge "If resume occurs, force finish of exiting activity." into nyc-dev am: fe77fdf
...
am: e4f870a
2016-03-28 17:29:23 +00:00
George Mount
5cf657ce0b
Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev am: 20d51f5
...
am: b031fef
2016-03-28 17:29:21 +00:00
George Mount
e4f870a14e
Merge "If resume occurs, force finish of exiting activity." into nyc-dev
...
am: fe77fdf
2016-03-28 17:25:35 +00:00
George Mount
b031fef2ec
Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev
...
am: 20d51f5
2016-03-28 17:25:33 +00:00
George Mount
fe77fdf8b3
Merge "If resume occurs, force finish of exiting activity." into nyc-dev
2016-03-28 17:21:11 +00:00
George Mount
20d51f550f
Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev
2016-03-28 17:20:53 +00:00
