Commit Graph

47543 Commits

Author SHA1 Message Date
Adrian Roos
7bfd6bd37f am 6fafa8cd: am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache
* commit '6fafa8cdcecbb7daf1c96e15c513f8ff7260df80':
  Obliterate LockPatternUtilsCache
2014-11-12 16:37:52 +00:00
Adrian Roos
6fafa8cdce am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache
* commit '36d059f9d995c8f52b9e6f0c6b540801ec249990':
  Obliterate LockPatternUtilsCache
2014-11-12 11:37:27 +00:00
Adrian Roos
138b83347b Obliterate LockPatternUtilsCache
It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.

Bug: 18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
2014-11-12 11:31:38 +00:00
Amith Yamasani
7c2f242230 am e73cab5f: Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d automerge: 15de62d
* commit 'e73cab5f1226f7434fa8bbf341e91891916683c5':
  Allow profile owners to set the unknown source setting
2014-11-12 03:44:49 +00:00
Junda Liu
5b7dbca7ca am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe
* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
2014-11-12 03:44:44 +00:00
Amith Yamasani
e73cab5f12 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d
automerge: 15de62d

* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
  Allow profile owners to set the unknown source setting
2014-11-12 03:13:59 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
2014-11-12 03:12:51 +00:00
Jeff Brown
70170261cb am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7
automerge: a473878

* commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6':
  Move device admin max screen off timeout to internal interface.
2014-11-12 02:46:10 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
2014-11-12 00:24:43 +00:00
Amith Yamasani
93ffd5dc0a Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 2014-11-12 00:07:59 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
2014-11-11 23:38:24 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
George Mount
ed22607780 am 341df464: am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
* commit '341df46488576899773cdfd438033fccc077ed83':
  Make setOutlineProvider change transitionGroup.
2014-11-11 15:53:05 +00:00
George Mount
341df46488 am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
  Make setOutlineProvider change transitionGroup.
2014-11-11 15:48:52 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Florian Salbrechter
940e97f802 Merge "Fixed missing opening quotes for href in javadoc." 2014-11-11 11:25:39 +00:00
Dianne Hackborn
35ed2f4c39 am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.
* commit '95ef0ac77738eac98e4952fe1e94db64c1560f5e':
  Add Activity API to get referrer information.
2014-11-11 01:03:02 +00:00
Dianne Hackborn
95ef0ac777 am 525da301: am 85d558cd: Add Activity API to get referrer information.
* commit '525da301930e554dc331828adee35613f945c250':
  Add Activity API to get referrer information.
2014-11-11 00:55:10 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information.
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
2014-11-11 00:42:18 +00:00
Alan Viverette
bd401c82b1 am 8c95fb8c: am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
* commit '8c95fb8cba3f1ae21161d386b0b74275d3c158d1':
  Call OnTimeChangedListener when new TimePicker values are selected
2014-11-11 00:38:42 +00:00
George Mount
2a0ac27b4f am a0bac643: am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev
* commit 'a0bac6434cf218bf216e30879f3f93740ecc4819':
  Only modify add Transition targets when they aren't targeted.
2014-11-11 00:38:34 +00:00
Alan Viverette
8c95fb8cba am e1362d11: am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
* commit 'e1362d1170471fe3d9946c4812509d7742b0724b':
  Call OnTimeChangedListener when new TimePicker values are selected
2014-11-11 00:30:03 +00:00
George Mount
a0bac6434c am 2fe4961d: am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev
* commit '2fe4961d0ddd490d5a82054537697c43cbfd5809':
  Only modify add Transition targets when they aren't targeted.
2014-11-11 00:29:50 +00:00
Alan Viverette
993e3d2d40 Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 2014-11-10 23:54:47 +00:00
George Mount
19c1cbda5a Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev 2014-11-10 23:48:34 +00:00
Adrian Roos
d09f5bd031 am 8953c119: am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71
* commit '8953c119fd81a20c56bf0ee30a6830dfbae9649b':
  Disable LockPatternUtilsCache
2014-11-10 22:13:18 +00:00
Alan Viverette
1bda3a13a2 am e4404938: am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068
* commit 'e4404938c260bee08f83a0b49609fdac9dd8f9aa':
  Clean up encapsulation in date picker classes
2014-11-10 22:13:09 +00:00
Dan Sandler
f2d9b00832 am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
  Fix inset hinting when adding window
2014-11-10 22:13:03 +00:00
Adrian Roos
8953c119fd am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
  Disable LockPatternUtilsCache
2014-11-10 22:04:27 +00:00
Alan Viverette
e4404938c2 am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068
* commit '5ec0f1c9deb37c2eca4d717e2076e5982bbef99b':
  Clean up encapsulation in date picker classes
2014-11-10 22:04:15 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
2014-11-10 22:04:09 +00:00
Adrian Roos
a0ecc714c3 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 2014-11-10 18:35:59 +00:00
Alan Viverette
c0bf068bbf Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 2014-11-10 18:29:29 +00:00
Adrian Roos
450ce9fc8a Disable LockPatternUtilsCache
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
2014-11-10 19:16:41 +01:00
Dan Sandler
04a1557c49 Merge "Fix inset hinting when adding window" into lmp-mr1-dev 2014-11-10 18:10:36 +00:00
Alan Viverette
fe3f4c811b am 8eb4bf60: am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
* commit '8eb4bf6017a34309c90427b1da6cb5f21538946a':
  Update above/below backgrounds in PopupWindow.setBackground()
2014-11-10 17:37:10 +00:00
Alan Viverette
8eb4bf6017 am 7213a52c: am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
* commit '7213a52c42e5dd176b30f01c274f36c63e32718e':
  Update above/below backgrounds in PopupWindow.setBackground()
2014-11-10 17:32:38 +00:00
Alan Viverette
82aaf332b6 Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 2014-11-10 17:18:49 +00:00
Andres Morales
e4aa7e7793 am 9e19c118: am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
* commit '9e19c118a140518859563ba81b691c6998e5084c':
  Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 17:05:20 +00:00
Andres Morales
9e19c118a1 am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f':
  Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:58:53 +00:00
Andres Morales
cc8d56f66c Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 2014-11-10 16:48:45 +00:00
Pete Gast
2f6cd6489f am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
  Expand WearableExtender to customize labels.
2014-11-10 16:48:29 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
2014-11-10 17:46:57 +01:00
Pete Gast
2ad988aa6e am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
* commit '642b4d93b9ce73866d7985172d31661a55aed7be':
  Expand WearableExtender to customize labels.
2014-11-10 16:45:02 +00:00
Pete Gast
705c9c131a Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 2014-11-10 16:35:57 +00:00
George Mount
92de9c1d7e am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
automerge: 47b4cf3

* commit '47b4cf3ac488af5b40cca819089905df98e17ab1':
  Allow PathMotion to affect translations in ChangeTransform.
2014-11-10 15:36:28 +00:00
George Mount
47b4cf3ac4 am 98b4cbf2: am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
* commit '98b4cbf21b0be8a17d006b1b0ddad45510c7a7bf':
  Allow PathMotion to affect translations in ChangeTransform.
2014-11-10 15:33:40 +00:00
George Mount
8f7d3715c5 Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 2014-11-10 15:25:10 +00:00
Alexandra Gherghina
0695ba054e am 40345df2: am e5332972: am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev
* commit '40345df2768f61d7f5e8e93e1d3b67e32c129498':
  Clarify documentation for DevicePolicyManager
2014-11-10 14:36:14 +00:00