Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,276 Commits 3 Branches 0 Tags
f5c178bdd3fcfe261ea43cbeef5c325a615af0e1
Commit Graph

45273 Commits

Author SHA1 Message Date
Esteban Talavera
cb7b978794 am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '52437ed732e9346752df7e348c7e5b0fdbd9b2ce':
  Update string value for provisioning action and extra
 2014-09-10 17:18:33 +00:00
Alexandra Gherghina
03e1e83697 Bugfix: use the correct user for ContentResolver calls 
Bug: 16860604
Change-Id: I2de228442b7bd824a115f56a24d682d346737976
 2014-09-10 18:13:12 +01:00
Ruben Brunk
a3256cd3e7 Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 2014-09-10 17:11:21 +00:00
Esteban Talavera
964a03bcaa am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
 2014-09-10 17:06:45 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Christoph Studer
ca1db7162a Notification: Reset chronometer visibility 
Bug: 17175860
Change-Id: Idd5ce5d22f30c01507d5207feaccdf1ac8a1a291
 2014-09-10 18:03:21 +02:00
Jason Monk
4534e26cc1 am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '6a74773572fdfe4001b7b3b47bc1ceafa426eb3a':
  Move zen mode constants and code to framework
 2014-09-10 15:20:57 +00:00
Jason Monk
e66afcdb46 am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '473d27fa34875083dfea48e933c2e9300979c64a':
  Move zen mode constants and code to framework
 2014-09-10 15:10:24 +00:00
John Spurlock
2cfe2229c5 am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '736196b23801319a4e477ad921cdd7f41eb66c2e':
  Zen: make Condition available over @SystemApi
 2014-09-10 15:04:31 +00:00
Jason Monk
c8e4fa41f2 Merge "Move zen mode constants and code to framework" into lmp-dev 2014-09-10 15:00:20 +00:00
John Spurlock
ee0d27f3d0 am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '821268455ca57051983c0e5f8cc24695033be174':
  Zen: make Condition available over @SystemApi
 2014-09-10 14:54:35 +00:00
George Mount
13a0819754 am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '568b3fe99baa8e5eba1acad6a522706f16803a40':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:51:05 +00:00
George Mount
5a88f7f343 am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit '557b3f662dee5298f793ec84ddcf134d34b96365':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:51:00 +00:00
John Spurlock
3e5d59c365 Merge "Zen: make Condition available over @SystemApi" into lmp-dev 2014-09-10 14:46:20 +00:00
John Spurlock
9034f2452b Zen: make Condition available over @SystemApi 
Fix build.

Bug:16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
 2014-09-10 10:42:13 -04:00
George Mount
ac0c86b344 am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:38:19 +00:00
George Mount
87995ee2be am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:38:15 +00:00
George Mount
b7d63aedf5 Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 2014-09-10 14:30:17 +00:00
George Mount
cb0567f98c Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 2014-09-10 14:29:59 +00:00
John Spurlock
39997db633 am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '88c61af5c1833e9a94f33e8150d23e7b6b50a319':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:56:05 +00:00
John Spurlock
7456ae83e8 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:45:09 +00:00
Jason Monk
4dd81467e3 Move zen mode constants and code to framework 
This allows the strings and code to be shared with settings.

Bug: 15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
 2014-09-10 09:30:03 -04:00
John Spurlock
bf4e41747d Zen: Make condition providers available via @SystemApi. 
Bug:16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
 2014-09-10 09:13:54 -04:00
Adrian Roos
444c6581ef am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit '99006f6cd5d64fa6accd4301646b4a58ac992d62':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:41:21 +00:00
Kenny Guy
1985b7e138 am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'a6e2ae352bf74ec29ae60d3f21e900d73e7da14e':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:32:20 +00:00
Christoph Studer
64fcd76970 am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '72d1509d598e53858db4f7d16d64761e32035990':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:32:15 +00:00
Christoph Studer
b14eb90414 am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '27674421aef9e3e3dd521a042b3fa939f9c92517':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:32:09 +00:00
Adrian Roos
f1fe1a3ac4 am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'be12538056cf441f441d42d2bf7d430ecdc3fd4f':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:32:07 +00:00
Adrian Roos
f950641e28 Merge "Add system trust agents on first boot or when adding user" into lmp-dev 2014-09-10 11:23:38 +00:00
Kenny Guy
4644ccf16a am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'cefee0c8185594f017ffd396cfe1877419c24371':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:22:10 +00:00
Christoph Studer
7c6c8bc488 am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '6e68dff3deb0ec350aa769b4936e52ea00262beb':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:22:06 +00:00
Christoph Studer
990ac120df am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit 'c4290acf31f537821c42356d8a5db22afd353d1c':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:22:02 +00:00
Kenny Guy
c8824b18c1 Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 2014-09-10 11:14:59 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Adam Connors
9e33450f5f am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '50c161df87f5af9862ed90af47c1252b7336f828':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:26:20 +00:00
Adam Connors
fb324578aa am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:38 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Yohei Yukawa
6f6734c6cb am d72d7869: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit 'd72d7869702f36911429da0ee8390e089a6f0a79':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:31:46 +00:00
Jessica Hummel
e0c2e0dbb4 am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '9a21c2a39afb36d1105680139acddb9adf4a9791':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:31:40 +00:00
Yohei Yukawa
5318ff8bf7 am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '107505bd85f615c82a1dca462581f8b10de72270':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:16:04 +00:00
Jessica Hummel
4eea5f821e am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:16:00 +00:00
Yohei Yukawa
f8eef09622 Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 2014-09-10 08:29:31 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Yohei Yukawa
443c2bafd8 Use public APIs to instantiate InputMethodSubtype 
This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.

Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.

BUG: 17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
 2014-09-10 15:42:14 +09:00
Lajos Molnar
0f491d7513 add android.util.SizeF.parseSizeF() 
Bug: 17190665
Change-Id: Ic1b0087dfd40b86aaeb4687a1a3024c1ab54018f
 2014-09-09 21:16:03 -07:00
Ruben Brunk
059d766e14 camera2: Fix preview stretching in LEGACY mode. 
Bug: 17447262
Change-Id: Idf4ba8d3702cf03c5b01045e2e3efe380b503002
 2014-09-09 19:04:45 -07:00
Jeff Davidson
2a129789ad Update unclear Fragment Javadoc. 
"Empty" could imply that the constructor body itself is empty, which
is not a requirement. All that matters is that the constructor is
public and takes no arguments.

Change-Id: Id1cda8835baee9f9ad89aba8b3d33b963e61e718
 2014-09-09 18:10:57 -07:00
Adam Lesinski
ceb63ed177 am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '2413aa5838c0d9e653c419c4566ab76a5c7bde2d':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 00:51:43 +00:00