Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
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
a98f7d715d am 8faef75e: am d72d7869: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '8faef75e308e80bc7ecbc4266cdd8c7baaba7171':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:41:40 +00:00
Jessica Hummel
285890c52d am fa2d0222: am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit 'fa2d0222de3f4c627e52647793a037cdd8bd110a':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:41:21 +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
0a2cfc6296 am 2feb9c9a: am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '2feb9c9a5153136d6d0f4d32859113fc1ebe6a4f':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 01:10:00 +00:00
Alan Viverette
a6bf7e0bbf am 2b731571: am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit '2b731571b3a3b2265183d4b303594e0052a422e0':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-10 01:09:37 +00:00
Adam Powell
b28776d5d5 am e9186d05: am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit 'e9186d0552f7d38e11be2b809c30e767bf259c8b':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-10 01:09:29 +00:00
Christopher Tate
6e78c704e7 am 2e44285f: am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '2e44285f8a7a235cb2ac44514bc702f9e3fd76eb':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 01:09:22 +00:00
Jeff Sharkey
823e56b79f am f7061676: am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'f706167630a44d372fdddb0321c0ecb0ed5d1bb3':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 01:08:32 +00:00
Yin-Chia Yeh
bd4e8987ce am 74405587: am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '7440558739b20b835923e53866cd1998e6a77a37':
  camera2: make 3A regions null when not available
 2014-09-10 01:08:25 +00:00
Eino-Ville Talvala
b0fbabb77b am 75b0c316: am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '75b0c316390daeddbfcc897bcd4a763fed557fef':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 01:08:16 +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
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
Adam Lesinski
7137ee38cb am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 00:17:53 +00:00
Alan Viverette
e05fa99b0f am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit 'b7afde5c05fa7bc37aa8cdd58b55b298dbeca004':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-10 00:17:35 +00:00
Adam Powell
8a0860c293 am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit '8197da7703d0753d29b3ab5fda8771ef9d165d40':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-10 00:17:31 +00:00
Christopher Tate
9bd0122216 am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '3b9417ff52248190fa324eef87bec8ab050e42f4':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 00:17:26 +00:00
Jeff Sharkey
1f43d44a07 am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 00:16:35 +00:00
Yin-Chia Yeh
a03742d854 am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
  camera2: make 3A regions null when not available
 2014-09-10 00:16:07 +00:00
Eino-Ville Talvala
2005a1c210 am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:16:03 +00:00
George Mount
fd3c4744f2 Use intrinsic size for path animation in AnimatedVectorDrawable 
Bug 16984007

Animated Vector Drawables were using the viewport dimensions for
calculating the allowable animation error. Instead of using viewport
dimensions, it is better to use the intrinsic dimensions. Using
the viewport dimensions meant that a small viewport (e.g. 1x1)
would mean that animation paths within would only have an accuracy
of 50% of the dimensions of the drawable.

Change-Id: Id0152eabb4effd1e50c644eea7a371b38baeb7c1
 2014-09-09 17:09:57 -07:00
Jon Miranda
7c744bdbf3 Tries to resolve reference resource names instead of its data. 
Example: @16974751 can be resolved to android:style/TextApperance.Material.

Bug: 17446752
Change-Id: I3ffede3ecc8689badd646a27d50a7a73ce45cf86
 2014-09-09 17:06:31 -07:00
Alan Viverette
97f84eeb0a Fix docs and nulling behavior for TextView.setCompoundDrawables 
BUG: 17444686
Change-Id: I879f32722dda4c976b00fcd003ed18b9488654ab
 2014-09-09 16:55:56 -07:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:50:04 +00:00
George Mount
ecfd007c8f Move capturing entering views until just before transition. 
Bug 17407387
Bug 17420256

Recycler view doesn't instantiate its views until after
the onCreateView call. This delays the capturing of
final views until just before the entering state is
captured for the Transition.

Change-Id: I425876eae44e7e0309b5c4407db1643d467cd94e
 2014-09-09 16:24:42 -07:00