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

58183 Commits

Author SHA1 Message Date
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
George Mount
5a3be5f99d 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:03 +00:00
George Mount
078564506f 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:37:58 +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
3961ecb0e5 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:22 +00: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
Adrian Roos
170f256ac6 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:18 +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
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
d42e221c30 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:11 +00:00
Christoph Studer
d02b5b5c10 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
dbd57a7386 am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit 'c4290acf31f537821c42356d8a5db22afd353d1c':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:22:01 +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
14376c8289 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:22 +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
7f69d52791 am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '107505bd85f615c82a1dca462581f8b10de72270':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:21:21 +00:00
Jessica Hummel
e923f6267a 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:21:16 +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
Eric Rowe
8ff01504b4 am b8b74fc5: am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev 
* commit 'b8b74fc594062422103ba491614b44c67330baf6':
  Allow protected wifi in connectivity tests
 2014-09-10 07:09:22 +00:00
Eric Rowe
24d0a48813 am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev 
* commit '9c8a45b554b4af5c8a7ca959eb8d0d4d05d91ace':
  Allow protected wifi in connectivity tests
 2014-09-10 07:01:20 +00:00
Alan Viverette
4967837be8 am f55bd6ac: am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev 
* commit 'f55bd6ac94cf1aab377db21bf3cc92abf1301aa8':
  Improve dialog padding when title or body text are missing
 2014-09-10 06:58:40 +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
Eric Rowe
5fea53d085 Merge "Allow protected wifi in connectivity tests" into lmp-dev 2014-09-10 02:43:23 +00:00
Eric Rowe
86e15557c5 Allow protected wifi in connectivity tests 
Change-Id: I31285572f90bfb46cc28fb04e79cb9b407477a7d
 2014-09-09 19:25:55 -07:00
Alan Viverette
ec2cef46c2 am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev 
* commit 'a9962d3609c2cf03ee7d437fcee2c339423da3c5':
  Improve dialog padding when title or body text are missing
 2014-09-10 01:36:29 +00:00
Alan Viverette
cd7955f66c Merge "Improve dialog padding when title or body text are missing" into lmp-dev 2014-09-10 01:27:57 +00:00
Alan Viverette
e809b11bc1 Improve dialog padding when title or body text are missing 
BUG: 17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
 2014-09-09 18:24:52 -07:00
Amit Mahajan
90ee64b7b6 am 299ad234: am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev 
* commit '299ad23423e22d137a8f5a373ed0154b00114077':
  Support to load default voicemail number from the configuration.
 2014-09-10 00:52:29 +00: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
Tsuwei Chen
441d6366cc am 6179e8c1: am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 
* commit '6179e8c15bf13babf994b4fb9df58c30e9c1c831':
  Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144
 2014-09-10 00:51:20 +00:00
Alan Viverette
8c2b2085c9 am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit '0ca92d44894f7af06f595368281034d762693c61':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-10 00:50:53 +00:00
Adam Powell
361ca8c1e9 am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit '129aeb1644b8faf9600d74e18b2ab799a121830f':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-10 00:50:48 +00:00
Christopher Tate
239e587ab9 am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '1ca58e08f44ae97ed238bdbb820eea12d62f6ce3':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 00:50:41 +00:00
Jeff Sharkey
2dadfeb306 am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit '47bf90808bd42a3fcfd5434ec216a8ba8859f8f0':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 00:50:06 +00:00
Yin-Chia Yeh
0efe661696 am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
  camera2: make 3A regions null when not available
 2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:49:31 +00:00
vandwalle
62609a1146 am 2dd81a13: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev 
* commit '2dd81a13a6a2f872e9b074f2e2dab6fa390a30fa':
  make autojoin associated scan period a config opttion
 2014-09-10 00:49:22 +00:00