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

61887 Commits

Author SHA1 Message Date
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
Jeff Brown
c1275e72ec am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
* commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9':
  Move device admin max screen off timeout to internal interface.
 2014-11-11 22:48:23 +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
Adam Lesinski
044f323e62 am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" 
* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
  Frameworks/base: Fix AssetManager JNI
 2014-11-11 19:53:44 +00:00
Alan Viverette
cf7f3b6be2 am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
automerge: 0aaebd4

* commit '0aaebd47cc94461aa2c0c87405f2a8ba809ef6c1':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 18:18:07 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +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
c07b6295c6 am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '12403b242f86c0572a99a963fd1e71eda680192b':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:45:09 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Andreas Gampe
328126190b Frameworks/base: Fix AssetManager JNI 
Register the right method.

Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
 2014-11-11 00:16:00 -08:00
Tim Kilbourn
06acead5a2 am 215779b2: am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '215779b2262a6fd0ebeb93a369ad148223984f30':
  Add tv product variants to strings.
 2014-11-11 06:42:51 +00:00
Tim Kilbourn
215779b226 am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.
 2014-11-11 06:37:52 +00:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Andreas Gampe
8c48c68cc7 am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 
* commit '71f83672f297b116988defbe989869e5744cda5e':
  Frameworks/base: Mask Skia warning in GraphicsJNI
 2014-11-11 05:10:19 +00:00
Andreas Gampe
ba823cee8b Frameworks/base: Mask Skia warning in GraphicsJNI 
Do not allow unused-parameter warnings from Skia includes.

Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
 2014-11-10 21:01:06 -08: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
525da30193 am 85d558cd: Add Activity API to get referrer information. 
* commit '85d558cd486d195aabfc4b43cff8f338126f60a5':
  Add Activity API to get referrer information.
 2014-11-11 00:47:53 +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
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
Yabin Cui
e7a89f5fa7 am a3131862: Merge "kill HAVE_INOTIFY" 
* commit 'a31318620bce4e00e80188ee2778b7799cbdf0dc':
  kill HAVE_INOTIFY
 2014-11-11 00:19:20 +00:00
Alan Viverette
f89b58ca83 Fix Material styling in remaining dialogs and layouts 
Also updates existing row and dialog layouts to use preferred list item
or dialog padding as appropriate, fixes incorrect activity themes, and
updates ChooseAccountActivity variants for Material.

BUG: 18314215
BUG: 18292562
Change-Id: I2fde4ba6db80d839104abdaa334a46ad1861600f
 2014-11-10 16:14:27 -08:00
Yabin Cui
a31318620b Merge "kill HAVE_INOTIFY" 2014-11-11 00:10:12 +00:00
Yabin Cui
20a9cf4fe4 kill HAVE_INOTIFY 
Bug: 18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
 2014-11-10 16:01:10 -08:00
Alan Viverette
e1362d1170 am 993e3d2d: Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev 
* commit '993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88':
  Call OnTimeChangedListener when new TimePicker values are selected
 2014-11-10 23:57:55 +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
2fe4961d0d am 19c1cbda: Merge "Only modify add Transition targets when they aren\'t targeted." into lmp-mr1-dev 
* commit '19c1cbda5a00b92e4e8c31b820b652c75a6c0a06':
  Only modify add Transition targets when they aren't targeted.
 2014-11-10 23:53:15 +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
Evan Charlton
13cf9cf1d3 am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f 
* commit '3caf6fc7df2e4240ae26026d4e1e9c3a23432975':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 22:35:46 +00:00
Yabin Cui
19d4e7806a am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER" 
* commit 'a9235301ad190814c779a13479b204f01980898f':
  kill HAVE_SCHED_SETSCHEDULER
 2014-11-10 22:24:03 +00:00
Yabin Cui
a9235301ad Merge "kill HAVE_SCHED_SETSCHEDULER" 2014-11-10 22:12:28 +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
Evan Charlton
3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 
automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 20:29:27 +00:00
Yabin Cui
65b4a68669 kill HAVE_SCHED_SETSCHEDULER 
Bug: 18300670

Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
 2014-11-10 12:21:57 -08:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.* 
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
 2014-11-10 11:52:31 -08:00
Adrian Roos
4dfc666cd2 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 
automerge: a0ecc71

* commit 'a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f':
  Disable LockPatternUtilsCache
 2014-11-10 19:06:54 +00:00
Alan Viverette
5ec0f1c9de Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 
automerge: c0bf068

* commit 'c0bf068bbff3080b930c9bb50bd6cc935b135536':
  Clean up encapsulation in date picker classes
 2014-11-10 19:04:39 +00:00
Tim Kilbourn
8299d02927 Add tv product variants to strings. 
Bug: 18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
 2014-11-10 10:45:13 -08: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
eba923ccce am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '04a1557c497d2ef0ab4011136b0945b20f291bb1':
  Fix inset hinting when adding window
 2014-11-10 18:13:35 +00: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
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
7213a52c42 am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '82aaf332b62c5a276c4046d1339441d68d817371':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:24: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
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