Change Version constant names.

ink/brush/brush_behavior.cc

@@ -494,9 +494,9 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::Source source) {
     case BrushBehavior::Source::
         kAccelerationLateralInCentimetersPerSecondSquared:
     case BrushBehavior::Source::kDistanceRemainingAsFractionOfStrokeLength:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
     case BrushBehavior::Source::kTimeSinceStrokeEndInSeconds:
-      return Version::k1Jetpack1_1_0Alpha01();
+      return Version::k1();
     case BrushBehavior::Source::kTimeFromInputToStrokeEndInSeconds:
       return Version::kDevelopment();
   }
@@ -520,7 +520,7 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::Target target) {
     case BrushBehavior::Target::kSaturationMultiplier:
     case BrushBehavior::Target::kLuminosityOffset:
     case BrushBehavior::Target::kOpacityMultiplier:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
     case BrushBehavior::Target::kTextureAnimationProgressOffset:
       return Version::kDevelopment();
   }
@@ -533,7 +533,7 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::PolarTarget target) {
         kPositionOffsetAbsoluteInRadiansAndMultiplesOfBrushSize:
     case BrushBehavior::PolarTarget::
         kPositionOffsetRelativeInRadiansAndMultiplesOfBrushSize:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -544,7 +544,7 @@ Version CalculateMinimumRequiredVersion(
     case BrushBehavior::OutOfRange::kClamp:
     case BrushBehavior::OutOfRange::kMirror:
     case BrushBehavior::OutOfRange::kRepeat:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -553,13 +553,13 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::BinaryOp operation) {
   switch (operation) {
     case BrushBehavior::BinaryOp::kProduct:
     case BrushBehavior::BinaryOp::kSum:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
     case BrushBehavior::BinaryOp::kMin:
     case BrushBehavior::BinaryOp::kMax:
     case BrushBehavior::BinaryOp::kAndThen:
     case BrushBehavior::BinaryOp::kOrElse:
     case BrushBehavior::BinaryOp::kXorElse:
-      return Version::k1Jetpack1_1_0Alpha01();
+      return Version::k1();
   }
   return Version::kDevelopment();
 }
@@ -570,7 +570,7 @@ Version CalculateMinimumRequiredVersion(
     case BrushBehavior::ProgressDomain::kDistanceInCentimeters:
     case BrushBehavior::ProgressDomain::kDistanceInMultiplesOfBrushSize:
     case BrushBehavior::ProgressDomain::kTimeInSeconds:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -580,7 +580,7 @@ Version CalculateMinimumRequiredVersion(
   switch (interpolation) {
     case BrushBehavior::Interpolation::kLerp:
     case BrushBehavior::Interpolation::kInverseLerp:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -596,7 +596,7 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::SourceNode node) {
 }
 
 Version CalculateMinimumRequiredVersion(BrushBehavior::ConstantNode node) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 Version CalculateMinimumRequiredVersion(BrushBehavior::NoiseNode node) {
@@ -608,16 +608,16 @@ Version CalculateMinimumRequiredVersion(
   return std::max({
       enabled.unknown
           ? CalculateMinimumRequiredVersion(StrokeInput::ToolType::kUnknown)
-          : Version::k0Jetpack1_0_0(),
+          : Version::k0(),
       enabled.mouse
           ? CalculateMinimumRequiredVersion(StrokeInput::ToolType::kMouse)
-          : Version::k0Jetpack1_0_0(),
+          : Version::k0(),
       enabled.touch
           ? CalculateMinimumRequiredVersion(StrokeInput::ToolType::kTouch)
-          : Version::k0Jetpack1_0_0(),
+          : Version::k0(),
       enabled.stylus
           ? CalculateMinimumRequiredVersion(StrokeInput::ToolType::kStylus)
-          : Version::k0Jetpack1_0_0(),
+          : Version::k0(),
   });
 }
 
@@ -636,8 +636,7 @@ Version CalculateMinimumRequiredVersion(BrushBehavior::ResponseNode node) {
 
 Version CalculateMinimumRequiredVersion(BrushBehavior::IntegralNode node) {
   return std::max(
-      {Version::k1Jetpack1_1_0Alpha01(),
-       CalculateMinimumRequiredVersion(node.integrate_over),
+      {Version::k1(), CalculateMinimumRequiredVersion(node.integrate_over),
        CalculateMinimumRequiredVersion(node.integral_out_of_range_behavior)});
 }
 
@@ -666,7 +665,7 @@ Version CalculateMinimumRequiredVersion(const BrushBehavior::Node& node) {
 }
 
 Version CalculateMinimumRequiredVersion(const BrushBehavior& behavior) {
-  Version max_version = Version::k0Jetpack1_0_0();
+  Version max_version = Version::k0();
   for (const auto& node : behavior.nodes) {
     max_version = std::max(max_version, CalculateMinimumRequiredVersion(node));
   }

ink/brush/brush_family.cc

@@ -194,7 +194,7 @@ absl::Status ValidateInputModel(const BrushFamily::InputModel& model) {
 }
 
 Version CalculateMinimumRequiredVersion(const BrushFamily::InputModel& model) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 std::string ToFormattedString(const BrushFamily::InputModel& model) {

ink/brush/brush_paint.cc

@@ -334,7 +334,7 @@ Version CalculateMinimumRequiredVersion(
     case BrushPaint::TextureOrigin::kStrokeSpaceOrigin:
     case BrushPaint::TextureOrigin::kFirstStrokeInput:
     case BrushPaint::TextureOrigin::kLastStrokeInput:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -344,7 +344,7 @@ Version CalculateMinimumRequiredVersion(
   switch (texture_size_unit) {
     case BrushPaint::TextureSizeUnit::kBrushSize:
     case BrushPaint::TextureSizeUnit::kStrokeCoordinates:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -354,7 +354,7 @@ Version CalculateMinimumRequiredVersion(BrushPaint::TextureWrap texture_wrap) {
     case BrushPaint::TextureWrap::kRepeat:
     case BrushPaint::TextureWrap::kMirror:
     case BrushPaint::TextureWrap::kClamp:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -373,7 +373,7 @@ Version CalculateMinimumRequiredVersion(BrushPaint::BlendMode blend_mode) {
     case BrushPaint::BlendMode::kSrcOut:
     case BrushPaint::BlendMode::kDstAtop:
     case BrushPaint::BlendMode::kXor:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
@@ -382,7 +382,7 @@ Version CalculateMinimumRequiredVersion(
     BrushPaint::AnimationRepeatMode animation_repeat_mode) {
   switch (animation_repeat_mode) {
     case BrushPaint::AnimationRepeatMode::kRestart:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
     case BrushPaint::AnimationRepeatMode::kReverse:
       return Version::kDevelopment();
   }
@@ -394,7 +394,7 @@ Version CalculateMinimumRequiredVersion(BrushPaint::SelfOverlap self_overlap) {
     case BrushPaint::SelfOverlap::kAny:
     case BrushPaint::SelfOverlap::kDiscard:
     case BrushPaint::SelfOverlap::kAccumulate:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }

ink/brush/brush_tip.cc

@@ -115,7 +115,7 @@ absl::Status ValidateBrushTip(const BrushTip& tip) {
 }
 
 Version CalculateMinimumRequiredVersion(const BrushTip& tip) {
-  Version max_version = Version::k0Jetpack1_0_0();
+  Version max_version = Version::k0();
   for (const auto& behavior : tip.behaviors) {
     max_version =
         std::max(max_version, CalculateMinimumRequiredVersion(behavior));

ink/brush/color_function.cc

@@ -169,7 +169,7 @@ namespace {
 
 Version CalculateMinimumRequiredVersion(
     const ColorFunction::OpacityMultiplier& opacity) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 Version CalculateMinimumRequiredVersion(const ColorFunction::HueOffset& hue) {
@@ -188,7 +188,7 @@ Version CalculateMinimumRequiredVersion(
 
 Version CalculateMinimumRequiredVersion(
     const ColorFunction::ReplaceColor& replace) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 Version CalculateMinimumRequiredVersion(

ink/brush/easing_function.cc

@@ -156,18 +156,18 @@ Version CalculateMinimumRequiredVersion(
     case EasingFunction::Predefined::kEaseInOut:
     case EasingFunction::Predefined::kStepStart:
     case EasingFunction::Predefined::kStepEnd:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }
 
 Version CalculateMinimumRequiredVersion(
     const EasingFunction::CubicBezier& cubic_bezier) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 Version CalculateMinimumRequiredVersion(const EasingFunction::Linear& linear) {
-  return Version::k0Jetpack1_0_0();
+  return Version::k0();
 }
 
 Version CalculateMinimumRequiredVersion(const EasingFunction::Steps& steps) {
@@ -190,7 +190,7 @@ Version CalculateMinimumRequiredVersion(
     case EasingFunction::StepPosition::kJumpStart:
     case EasingFunction::StepPosition::kJumpNone:
     case EasingFunction::StepPosition::kJumpBoth:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
   }
   return Version::kDevelopment();
 }

ink/brush/internal/jni/brush_native_helper.cc

@@ -25,9 +25,9 @@ namespace ink::native {
 Version IntToVersion(int version) {
   switch (version) {
     case 0:
-      return Version::k0Jetpack1_0_0();
+      return Version::k0();
     case 1:
-      return Version::k1Jetpack1_1_0Alpha01();
+      return Version::k1();
     case std::numeric_limits<int32_t>::max():
       return Version::kDevelopment();
     default:

ink/brush/version.h

@@ -19,15 +19,19 @@ class Version {
 
   std::string ToFormattedString() const { return absl::StrCat(value_); }
 
-  // Brush version is incremented when new features are ready to be released.
-  // This is a versioning process independent of the Jetpack version. A Jetpack
-  // version may have multiple brush version increments, or none at all
-  // (containing only previously released brush versions).
-
-  // Included with Jetpack 1.1.0-alpha01.
-  static constexpr Version k1Jetpack1_1_0Alpha01() { return Version(1); }
-  // Included with Jetpack 1.0.0.
-  static constexpr Version k0Jetpack1_0_0() { return Version(0); }
+  // A Version represents a version of the Ink library's custom brush
+  // serialization format. This is independent of the Jetpack version. A Jetpack
+  // release may have multiple brush version increments, or none at all
+  // (containing only previously released brush versions). Version is used to
+  // determine compatibility of serialized brushes which may be shared across
+  // apps using different releases of this library.
+
+  // Included with
+  // [Jetpack 1.1.0-alpha01](https://developer.android.com/jetpack/androidx/releases/ink#1.1.0-alpha01).
+  static constexpr Version k1() { return Version(1); }
+  // Included with
+  // [Jetpack 1.0.0](https://developer.android.com/jetpack/androidx/releases/ink#1.0.0).
+  static constexpr Version k0() { return Version(0); }
 
   // Features associated with kDevelopment will always be rejected by the
   // deserializer due to kDevelopment > kMaxSupported. The only exception is
@@ -42,7 +46,7 @@ class Version {
   // customization format. Features still under development should be associated
   // with kDevelopment until they are ready to be released, after which they
   // are expected to be supported long-term.
-  static constexpr Version kMaxSupported() { return k1Jetpack1_1_0Alpha01(); }
+  static constexpr Version kMaxSupported() { return k1(); }
 
  private:
   explicit constexpr Version(int32_t value) : value_(value) {